From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Thu, 19 Aug 2010 11:17:12 +0000 (+0000)
Subject: Fix test_os: workaround #8611 bug
X-Git-Tag: v3.2a2~210
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=70f88c59eb285f85b8d16b88a75aeeb6b6a2b9ab;p=thirdparty%2FPython%2Fcpython.git

Fix test_os: workaround #8611 bug
---

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index cd8a1b973eef..4910b1e3a988 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -1165,9 +1165,16 @@ class FSEncodingTests(unittest.TestCase):
             decoded = self.get_output(encoding, 'repr(os.fsdecode(%a))' % bytesfn)
             self.assertEqual(decoded, repr(unicodefn))
 
-        check('ascii', b'abc\xff', 'abc\udcff')
         check('utf-8', b'\xc3\xa9\x80', '\xe9\udc80')
-        check('iso-8859-15', b'\xef\xa4', '\xef\u20ac')
+        try:
+            sys.executable.encode("ascii")
+        except UnicodeEncodeError:
+            # Python doesn't start with ASCII locale if its path is not ASCII,
+            # see issue #8611
+            pass
+        else:
+            check('ascii', b'abc\xff', 'abc\udcff')
+            check('iso-8859-15', b'\xef\xa4', '\xef\u20ac')
 
 
 def test_main():