From: Henk-Jaap Wagenaar <wagenaarhenkjaap@gmail.com>
Date: Fri, 17 Nov 2017 10:10:19 +0000 (+0000)
Subject: bpo-31867: Remove duplicates in default mimetypes. (#4388)
X-Git-Tag: v3.7.0a3~148
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f02f5e5c3eb815fff9578dc58de60374c6baaa3d;p=thirdparty%2FPython%2Fcpython.git

bpo-31867: Remove duplicates in default mimetypes. (#4388)
---

diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py
index 5919b45a9b4f..44112027cb9a 100644
--- a/Lib/mimetypes.py
+++ b/Lib/mimetypes.py
@@ -412,8 +412,6 @@ def _default_mime_types():
         '.bin'    : 'application/octet-stream',
         '.bmp'    : 'image/x-ms-bmp',
         '.c'      : 'text/plain',
-        # Duplicates :(
-        '.cdf'    : 'application/x-cdf',
         '.cdf'    : 'application/x-netcdf',
         '.cpio'   : 'application/x-cpio',
         '.csh'    : 'application/x-csh',
@@ -522,8 +520,6 @@ def _default_mime_types():
         '.wsdl'   : 'application/xml',
         '.xbm'    : 'image/x-xbitmap',
         '.xlb'    : 'application/vnd.ms-excel',
-        # Duplicates :(
-        '.xls'    : 'application/excel',
         '.xls'    : 'application/vnd.ms-excel',
         '.xml'    : 'text/xml',
         '.xpdl'   : 'application/xml',