merge heads

This commit is contained in:
Benjamin Peterson 2012-02-20 09:02:57 -05:00
commit 0588eac218
1 changed files with 4 additions and 3 deletions

View File

@ -22,12 +22,13 @@ work. One should use importlib as the public-facing version of this module.
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):