From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 17 May 2010 19:57:40 +0000 (+0000)
Subject: Fix test_main_invalid_unicode() of test_sys for ASCII locale encoding
X-Git-Tag: v3.2a1~765
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0983856c6814272a5e6004bd50b429afba3f3b4;p=python

Fix test_main_invalid_unicode() of test_sys for ASCII locale encoding

It should fix sparc 3.x and 3.1 failures.
---

diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index a1b5ee741e..4fb1d366a5 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -152,7 +152,7 @@ class SysModuleTest(unittest.TestCase):
             stdout, stderr = process.communicate()
             self.assertEqual(process.returncode, 1)
             self.assertTrue(stderr.startswith(expected),
-                            "%r doesn't start with %r" % (stderr, expected))
+                "%s doesn't start with %s" % (ascii(stderr), ascii(expected)))
 
         # test that stderr buffer if flushed before the exit message is written
         # into stderr
@@ -485,9 +485,8 @@ class SysModuleTest(unittest.TestCase):
         p = subprocess.Popen([sys.executable, "-c", code], stderr=subprocess.PIPE)
         stdout, stderr = p.communicate()
         self.assertEqual(p.returncode, 1)
-        self.assert_(stderr.startswith(b"UnicodeEncodeError: "
-            b"'utf-8' codec can't encode character '\\udcff' in "
-            b"position 7: surrogates not allowed"), stderr)
+        self.assert_(b"UnicodeEncodeError:" in stderr,
+            "%r not in %s" % (b"UniodeEncodeError:", ascii(stderr)))
 
     def test_sys_flags(self):
         self.assertTrue(sys.flags)