]> granicus.if.org Git - python/commitdiff
Tentatively enable test_pep277 on all platforms.
authorFlorent Xicluna <florent.xicluna@gmail.com>
Tue, 2 Mar 2010 21:34:45 +0000 (21:34 +0000)
committerFlorent Xicluna <florent.xicluna@gmail.com>
Tue, 2 Mar 2010 21:34:45 +0000 (21:34 +0000)
Lib/test/test_pep277.py
Misc/NEWS

index 4695e0a4352cf41e3b5e44ae6f58ad926f33cffc..e5f538e024016af8722bb82433a8989123c4ae4c 100644 (file)
@@ -2,8 +2,9 @@
 # open, os.open, os.stat. os.listdir, os.rename, os.remove, os.mkdir, os.chdir, os.rmdir
 import sys, os, unittest
 from test import test_support
-if not os.path.supports_unicode_filenames:
-    raise unittest.SkipTest, "test works only on NT+"
+## There's no obvious reason to skip these tests on POSIX systems
+# if not os.path.supports_unicode_filenames:
+#     raise unittest.SkipTest, "test works only on NT+"
 
 filenames = [
     'abc',
@@ -51,6 +52,9 @@ class UnicodeFileTests(unittest.TestCase):
             raise test_support.TestFailed("Expected to fail calling '%s(%r)'"
                              % (fn.__name__, filename))
         except expected_exception, details:
+            # the "filename" exception attribute may be encoded
+            if isinstance(details.filename, str):
+                filename = filename.encode(sys.getfilesystemencoding())
             if check_fn_in_exception and details.filename != filename:
                 raise test_support.TestFailed("Function '%s(%r) failed with "
                                  "bad filename in the exception: %r"
@@ -80,7 +84,7 @@ class UnicodeFileTests(unittest.TestCase):
         f1 = os.listdir(test_support.TESTFN)
         f2 = os.listdir(unicode(test_support.TESTFN,
                                 sys.getfilesystemencoding()))
-        sf2 = set(u"\\".join((unicode(test_support.TESTFN), f))
+        sf2 = set(os.path.join(unicode(test_support.TESTFN), f)
                   for f in f2)
         self.assertEqual(len(f1), len(self.files))
         self.assertEqual(sf2, set(self.files))
index b25b32ac2943963b332901676916f6f7f8eb5ac8..d386c2fdf36dec20d158a55c3dd2d8ef50931399 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -106,6 +106,8 @@ Extension Modules
 Tests
 -----
 
+- Issue #767675: enable test_pep277 on all platforms.
+
 - Issue #6292: for the moment at least, the test suite runs cleanly if python
   is run with the -OO flag.  Tests requiring docstrings are skipped.