[Python-checkins] cpython (merge default -> default): merge heads

Mon Feb 20 15:03:01 CET 2012

http://hg.python.org/cpython/rev/1f9461ef6312
changeset: 75057:1f9461ef6312
parent: 75056:9a156474d678
parent: 75055:b8576719fe71
user: Benjamin Peterson <benjamin at python.org>
date: Mon Feb 20 09:02:57 2012 -0500
summary:
 merge heads
files:
 Lib/importlib/_bootstrap.py | 7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -22,12 +22,13 @@
 CASE_INSENSITIVE_PLATFORMS = 'win', 'cygwin', 'darwin'
 
 
-def _relax_case():
- """True if filenames must be checked case-insensitively."""
+def _make_relax_case():
 if any(map(sys.platform.startswith, CASE_INSENSITIVE_PLATFORMS)):
+ """True if filenames must be checked case-insensitively."""
 def _relax_case():
 return b'PYTHONCASEOK' in _os.environ
 else:
+ """True if filenames must be checked case-insensitively."""
 def _relax_case():
 return False
 return _relax_case
@@ -1117,7 +1118,7 @@
 setattr(self_module, '_os', os_module)
 setattr(self_module, 'path_sep', path_sep)
 # Constants
- setattr(self_module, '_relax_case', _relax_case())
+ setattr(self_module, '_relax_case', _make_relax_case())
 
 
 def _install(sys_module, imp_module):
-- 
Repository URL: http://hg.python.org/cpython
