Merge for #27083

Author: brettcannon

Lib/importlib/_bootstrap_external.py

@@ -29,7 +29,8 @@ 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
+            return (b'PYTHONCASEOK' in _os.environ
+                    or 'PYTHONCASEOK' in _os.environ)
     else:
         def _relax_case():
             """True if filenames must be checked case-insensitively."""

Lib/test/test_importlib/source/test_case_sensitivity.py

@@ -38,12 +38,17 @@ def sensitivity_test(self):
             insensitive_finder = self.finder(insensitive_path)
             return self.find(sensitive_finder), self.find(insensitive_finder)
 
+    def env_changed(self, *, should_exist):
+        possibilities = b'PYTHONCASEOK', 'PYTHONCASEOK'
+        if any(x in self.importlib._bootstrap_external._os.environ
+                   for x in possibilities) == should_exist:
+            self.skipTest('os.environ changes not reflected in '
+                              '_os.environ')
+
     def test_sensitive(self):
         with test_support.EnvironmentVarGuard() as env:
             env.unset('PYTHONCASEOK')
-            if b'PYTHONCASEOK' in self.importlib._bootstrap_external._os.environ:
-                self.skipTest('os.environ changes not reflected in '
-                              '_os.environ')
+            self.env_changed(should_exist=False)
             sensitive, insensitive = self.sensitivity_test()
             self.assertIsNotNone(sensitive)
             self.assertIn(self.name, sensitive.get_filename(self.name))
@@ -52,9 +57,7 @@ def test_sensitive(self):
     def test_insensitive(self):
         with test_support.EnvironmentVarGuard() as env:
             env.set('PYTHONCASEOK', '1')
-            if b'PYTHONCASEOK' not in self.importlib._bootstrap_external._os.environ:
-                self.skipTest('os.environ changes not reflected in '
-                              '_os.environ')
+            self.env_changed(should_exist=True)
             sensitive, insensitive = self.sensitivity_test()
             self.assertIsNotNone(sensitive)
             self.assertIn(self.name, sensitive.get_filename(self.name))

Misc/NEWS

@@ -10,6 +10,8 @@ What's New in Python 3.6.0 alpha 4
 Core and Builtins
 -----------------
 
+- Issue #27083: Respect the PYTHONCASEOK environment variable under Windows.
+
 - Issue #27514: Make having too many statically nested blocks a SyntaxError
   instead of SystemError.