From: Victor Stinner <victor.stinner@gmail.com>
Date: Mon, 5 Nov 2012 00:28:28 +0000 (+0100)
Subject: Issue #15478: Fix test_pep277 on Windows
X-Git-Tag: v3.4.0a1~2078
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=efe2b53d12adccbe87d75c511c2dc88acec0ac63;p=thirdparty%2FPython%2Fcpython.git

Issue #15478: Fix test_pep277 on Windows

os.listdir() now returns the original path in OSError.filename (on any
platform), even if "*.*" was added to the path (on Windows).
---

diff --git a/Lib/test/test_pep277.py b/Lib/test/test_pep277.py
index 4b16cbb383d2..9bae6dcad7a3 100644
--- a/Lib/test/test_pep277.py
+++ b/Lib/test/test_pep277.py
@@ -99,10 +99,6 @@ class UnicodeFileTests(unittest.TestCase):
         with self.assertRaises(expected_exception) as c:
             fn(filename)
         exc_filename = c.exception.filename
-        # listdir may append a wildcard to the filename
-        if fn is os.listdir and sys.platform == 'win32':
-            exc_filename, _, wildcard = exc_filename.rpartition(os.sep)
-            self.assertEqual(wildcard, '*.*')
         if check_filename:
             self.assertEqual(exc_filename, filename, "Function '%s(%a) failed "
                              "with bad filename in the exception: %a" %