Author: benjamin.peterson Date: Mon Mar 2 04:42:39 2009 New Revision: 70087 Log: Merged revisions 70086 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r70086 | benjamin.peterson | 2009-03-01 21:35:12 -0600 (Sun, 01 Mar 2009) | 1 line fix a silly problem of caching gone wrong #5401 ........ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Lib/mimetypes.py python/branches/release26-maint/Misc/NEWS Modified: python/branches/release26-maint/Lib/mimetypes.py ============================================================================== --- python/branches/release26-maint/Lib/mimetypes.py (original) +++ python/branches/release26-maint/Lib/mimetypes.py Mon Mar 2 04:42:39 2009 @@ -237,7 +237,8 @@ Optional `strict' argument when false adds a bunch of commonly found, but non-standard types. """ - init() + if not inited: + init() return guess_type(url, strict) @@ -254,7 +255,8 @@ Optional `strict' argument when false adds a bunch of commonly found, but non-standard types. """ - init() + if not inited: + init() return guess_all_extensions(type, strict) def guess_extension(type, strict=True): @@ -269,7 +271,8 @@ Optional `strict' argument when false adds a bunch of commonly found, but non-standard types. """ - init() + if not inited: + init() return guess_extension(type, strict) def add_type(type, ext, strict=True): @@ -284,7 +287,8 @@ list of standard types, else to the list of non-standard types. """ - init() + if not inited: + init() return add_type(type, ext, strict) Modified: python/branches/release26-maint/Misc/NEWS ============================================================================== --- python/branches/release26-maint/Misc/NEWS (original) +++ python/branches/release26-maint/Misc/NEWS Mon Mar 2 04:42:39 2009 @@ -89,6 +89,9 @@ Library ------- +- Issue #5401: Fixed a performance problem in mimetypes when ``from mimetypes + import guess_extension`` was used. + - Issue #1733986: Fixed mmap crash in accessing elements of second map object with same tagname but larger size than first map. (Windows)