test_undecodable_code(): set locale to C

The test is still failing on "x86 FreeBSD 7.2 3.x" and "sparc solaris10 gcc
3.x" buildbots. It looks like the locale encoding is able to decode b'\xff'. I
suppose that it is an encoding like 'iso-8859-1'.

Use C locale to set, I hope, the locale encoding to 'ascii'. Display also the
encoding so if the test fails, at least I will learn the locale encoding
choosen for the C locale.

1 files changed, 12 insertions, 15 deletions

diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 448fd3f..e09601f 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -495,24 +495,21 @@ class SysModuleTest(unittest.TestCase):
 
         self.assertRaises(TypeError, sys.intern, S("abc"))
 
-    def test_main_invalid_unicode(self):
-        import locale
+    def test_undecodable_code(self):
         non_decodable = b"\xff"
-        encoding = locale.getpreferredencoding()
-        try:
-            non_decodable.decode(encoding)
-        except UnicodeDecodeError:
-            pass
-        else:
-            self.skipTest('%r is decodable with encoding %s'
-                % (non_decodable, encoding))
-        code = b'print(ascii("' + non_decodable + b'"))'
-        p = subprocess.Popen([sys.executable, "-c", code], stderr=subprocess.PIPE)
+        env = os.environ.copy()
+        env['LANG'] = 'C'
+        code = b'import locale; '
+        code += b'print(ascii("' + non_decodable + b'"), locale.getpreferredencoding())'
+        p = subprocess.Popen(
+            [sys.executable, "-c", code],
+            stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
+            env=env)
         stdout, stderr = p.communicate()
-        self.assertEqual(p.returncode, 1)
         pattern = b"Unable to decode the command from the command line:"
-        if not stderr.startswith(pattern):
-            raise AssertionError("%a doesn't start with %a" % (stderr, pattern))
+        if not stdout.startswith(pattern):
+            raise AssertionError("%a doesn't start with %a" % (stdout, pattern))
+        self.assertEqual(p.returncode, 1)
 
     def test_sys_flags(self):
         self.assertTrue(sys.flags)