[Python-checkins] r85753 - in python/branches/issue4388/Lib/test: test_cmd_line.py test_pydoc.py

[victor.stinner]

Author: victor.stinner
Date: Wed Oct 20 18:30:36 2010
New Revision: 85753

Log:
test_cmd_line: test without locale env vars


Modified:
   python/branches/issue4388/Lib/test/test_cmd_line.py
   python/branches/issue4388/Lib/test/test_pydoc.py

Modified: python/branches/issue4388/Lib/test/test_cmd_line.py
==============================================================================
--- python/branches/issue4388/Lib/test/test_cmd_line.py	(original)
+++ python/branches/issue4388/Lib/test/test_cmd_line.py	Wed Oct 20 18:30:36 2010
@@ -107,7 +107,10 @@
                       % (locale.getpreferredencoding(), sys.getfilesystemencoding()))
             env = os.environ.copy()
             for key in ('LC_ALL', 'LC_CTYPE', 'LANG'):
-                env[key] = 'C'
+                try:
+                    del env[key]
+                except KeyError:
+                    pass
             command = "assert(ord('\xe9') == 0xe9)"
             assert_python_ok('-c', command, env=env)
 

Modified: python/branches/issue4388/Lib/test/test_pydoc.py
==============================================================================
--- python/branches/issue4388/Lib/test/test_pydoc.py	(original)
+++ python/branches/issue4388/Lib/test/test_pydoc.py	Wed Oct 20 18:30:36 2010
@@ -204,7 +204,7 @@
         env['PYTHONIOENCODING'] = 'utf-8'
         output = subprocess.Popen(cmd, stdout=subprocess.PIPE, env=env).communicate()[0]
         output = str(output, 'utf-8', 'surrogatepass')
-        return output.rstrip()
+        return output.strip()
     finally:
         reap_children()