summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-11-04 17:15:45 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-11-04 17:15:45 (GMT)
commitce7554f0a1159e5c473be34090ee85675f4835a4 (patch)
tree55a0ffc5de5a9af7f5df5178337a825d66ac2b81
parent5f761d79c0578c24f72663493915b8975e246fbd (diff)
downloadcpython-ce7554f0a1159e5c473be34090ee85675f4835a4.zip
cpython-ce7554f0a1159e5c473be34090ee85675f4835a4.tar.gz
cpython-ce7554f0a1159e5c473be34090ee85675f4835a4.tar.bz2
Revert commit that was not a bugfix (#5301).
I won’t revert in 3.2, since Georg pulled this change in 3.2.2 and released it.
-rw-r--r--Lib/mimetypes.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py
index 8347786..4c054c9 100644
--- a/Lib/mimetypes.py
+++ b/Lib/mimetypes.py
@@ -432,7 +432,6 @@ def _default_mime_types():
'.hdf' : 'application/x-hdf',
'.htm' : 'text/html',
'.html' : 'text/html',
- '.ico' : 'image/vnd.microsoft.icon',
'.ief' : 'image/ief',
'.jpe' : 'image/jpeg',
'.jpeg' : 'image/jpeg',