Logic for determining whether skipping test_pep277 is expected: whether

ths "should be" skipped depends on os.path.supports_unicode_filenames,
not really on the platform.  Fiddled the expected-skip constructor
appropriately.

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 4f556bd45504a5cb2240a500ae7eaf74c8d60c48..248bad45b82f8d6cbdc0789313b3372ee8a08ee6 100755 (executable)
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -495,6 +495,11 @@ def printlist(x, width=70, indent=4):
 
 # Map sys.platform to a string containing the basenames of tests
 # expected to be skipped on that platform.
+#
+# Special cases:
+#     test_pep277
+#         The _ExpectedSkips constructor adds this to the set of expected
+#         skips if not os.path.supports_unicode_filenames.
 
 _expectations = {
     'win32':
@@ -543,7 +548,6 @@ _expectations = {
         test_largefile
         test_nis
         test_ntpath
-        test_pep277
         test_socket_ssl
         test_socketserver
         test_sunaudiodev
@@ -819,10 +823,13 @@ _expectations = {
 
 class _ExpectedSkips:
     def __init__(self):
+        import os.path
         self.valid = False
         if sys.platform in _expectations:
             s = _expectations[sys.platform]
             self.expected = Set(s.split())
+            if not os.path.supports_unicode_filenames:
+                self.expected.add('test_pep277')
             self.valid = True
 
     def isvalid(self):