summaryrefslogtreecommitdiffstats
path: root/Lib/importlib/_bootstrap.py
diff options
context:
space:
mode:
authorMeador Inge <meadori@gmail.com>2013-09-03 22:32:13 (GMT)
committerMeador Inge <meadori@gmail.com>2013-09-03 22:32:13 (GMT)
commit2b0a98f5405866076456ed55ed6a382c7a3f4260 (patch)
tree355a09f4547b709358149bf81406f5a946bfeab4 /Lib/importlib/_bootstrap.py
parente06a89655a460e7d6571ffea0b72aefef4c0a1cc (diff)
parent9ab358ad7cfc235556f52923bcf265b5bc32b4fc (diff)
downloadcpython-2b0a98f5405866076456ed55ed6a382c7a3f4260.zip
cpython-2b0a98f5405866076456ed55ed6a382c7a3f4260.tar.gz
cpython-2b0a98f5405866076456ed55ed6a382c7a3f4260.tar.bz2
Merge heads.
Diffstat (limited to 'Lib/importlib/_bootstrap.py')
-rw-r--r--Lib/importlib/_bootstrap.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
index 9174057..fad91ca 100644
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -29,7 +29,10 @@ def _make_relax_case():
if sys.platform.startswith(_CASE_INSENSITIVE_PLATFORMS):
def _relax_case():
"""True if filenames must be checked case-insensitively."""
- return b'PYTHONCASEOK' in _os.environ
+ if sys.flags.ignore_environment:
+ return False
+ else:
+ return b'PYTHONCASEOK' in _os.environ
else:
def _relax_case():
"""True if filenames must be checked case-insensitively."""