summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorWalter Dörwald <walter@livinglogic.de>2003-01-03 19:33:17 (GMT)
committerWalter Dörwald <walter@livinglogic.de>2003-01-03 19:33:17 (GMT)
commitbb51ed333b623b6acf90a34ec6da9b4d076503e5 (patch)
tree30db46f1c3800dd974d1a4bb68225c317c03bd54 /Lib
parentaf6a27a704cd832f91e25b1052f4b6cc52a4e704 (diff)
downloadcpython-bb51ed333b623b6acf90a34ec6da9b4d076503e5.zip
cpython-bb51ed333b623b6acf90a34ec6da9b4d076503e5.tar.gz
cpython-bb51ed333b623b6acf90a34ec6da9b4d076503e5.tar.bz2
Fix read_mime_types() so that it returns a dict as documented.
This fixes a bug reported as http://www.python.org/sf/661630, which was introduced in the patch http://www.python.org/sf/554192.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/mimetypes.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py
index 846d56b..f1a1a3e 100644
--- a/Lib/mimetypes.py
+++ b/Lib/mimetypes.py
@@ -315,8 +315,8 @@ def read_mime_types(file):
except IOError:
return None
db = MimeTypes()
- db.readfp(f)
- return db.types_map
+ db.readfp(f, True)
+ return db.types_map[True]
suffix_map = {