summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-03-09 21:04:33 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-03-09 21:04:33 (GMT)
commite0124bd9c3d3af4bd36d9977e0f76da2cf8a1412 (patch)
treebbbe42587affafea03e122d87aadbbf570e1b820 /Lib
parent07c0a7579b8e578d78882e8a33d6bea76025304f (diff)
downloadcpython-e0124bd9c3d3af4bd36d9977e0f76da2cf8a1412.zip
cpython-e0124bd9c3d3af4bd36d9977e0f76da2cf8a1412.tar.gz
cpython-e0124bd9c3d3af4bd36d9977e0f76da2cf8a1412.tar.bz2
Merged revisions 69998-69999,70002,70022-70023,70025-70026,70061,70086,70145,70171,70183,70188,70235,70244,70275,70281 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r69998 | benjamin.peterson | 2009-02-26 13:04:40 -0600 (Thu, 26 Feb 2009) | 1 line the startship is rather outdated now ........ r69999 | benjamin.peterson | 2009-02-26 13:05:59 -0600 (Thu, 26 Feb 2009) | 1 line comma ........ r70002 | andrew.kuchling | 2009-02-26 16:34:30 -0600 (Thu, 26 Feb 2009) | 1 line The curses panel library is now supported ........ r70022 | georg.brandl | 2009-02-27 10:23:18 -0600 (Fri, 27 Feb 2009) | 1 line #5361: fix typo. ........ r70023 | georg.brandl | 2009-02-27 10:39:26 -0600 (Fri, 27 Feb 2009) | 1 line #5363: fix cmpfiles() docs. Another instance where a prose description is twice as long as the code. ........ r70025 | georg.brandl | 2009-02-27 10:52:55 -0600 (Fri, 27 Feb 2009) | 1 line #5344: fix punctuation. ........ r70026 | georg.brandl | 2009-02-27 10:59:03 -0600 (Fri, 27 Feb 2009) | 1 line #5365: add quick look conversion table for different time representations. ........ r70061 | hirokazu.yamamoto | 2009-02-28 09:24:00 -0600 (Sat, 28 Feb 2009) | 1 line Binary flag is needed on windows. ........ 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 ........ r70145 | benjamin.peterson | 2009-03-03 16:51:57 -0600 (Tue, 03 Mar 2009) | 1 line making the writing more formal ........ r70171 | facundo.batista | 2009-03-04 15:18:17 -0600 (Wed, 04 Mar 2009) | 3 lines Fixed a typo. ........ r70183 | benjamin.peterson | 2009-03-04 18:17:57 -0600 (Wed, 04 Mar 2009) | 1 line add example ........ r70188 | hirokazu.yamamoto | 2009-03-05 03:34:14 -0600 (Thu, 05 Mar 2009) | 1 line Fixed memory leak on failure. ........ r70235 | benjamin.peterson | 2009-03-07 18:21:17 -0600 (Sat, 07 Mar 2009) | 1 line fix funky indentation ........ r70244 | martin.v.loewis | 2009-03-08 09:06:19 -0500 (Sun, 08 Mar 2009) | 2 lines Add Chris Withers. ........ r70275 | georg.brandl | 2009-03-09 11:35:48 -0500 (Mon, 09 Mar 2009) | 2 lines Add missing space. ........ r70281 | benjamin.peterson | 2009-03-09 15:38:56 -0500 (Mon, 09 Mar 2009) | 1 line gzip and bz2 are context managers ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/mimetypes.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py
index 5812c0c..f25e133 100644
--- a/Lib/mimetypes.py
+++ b/Lib/mimetypes.py
@@ -237,7 +237,8 @@ def guess_type(url, strict=True):
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 @@ def guess_all_extensions(type, strict=True):
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 @@ def guess_extension(type, strict=True):
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 @@ def add_type(type, ext, strict=True):
list of standard types, else to the list of non-standard
types.
"""
- init()
+ if not inited:
+ init()
return add_type(type, ext, strict)