From: R David Murray <rdmurray@bitdance.com>
Date: Tue, 27 Mar 2012 01:06:04 +0000 (-0400)
Subject: #5301: re-add image/vnd.microsoft.icon per discussion
X-Git-Tag: v2.7.4rc1~942
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4922a46e1a9c4444df7664a799a847f86e24237f;p=python

#5301: re-add image/vnd.microsoft.icon per discussion

We concluded that adding registered mimetypes present in most systems' mime
databases can be considered a bug fix.
---

diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py
index 4c054c961c..8347786440 100644
--- a/Lib/mimetypes.py
+++ b/Lib/mimetypes.py
@@ -432,6 +432,7 @@ 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',