merge heads

benjaminp · benjaminp · commit 0588eac21852 · 2012-02-20T09:02:57.000-05:00
diff --git 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 @@ def _setup(sys_module, imp_module):
     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):
