From e3874ed7dd978292d43ccdef1ad7896dfec663a7 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sun, 17 Oct 2010 01:41:09 +0000 Subject: test_cmd_line_script: format paths with ascii() instead of repr() Fix the test if the native filesystem encoding is not utf-8 (eg. cp1250 on Windows). --- Lib/test/test_cmd_line_script.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py index bd34392..921c5f3 100644 --- a/Lib/test/test_cmd_line_script.py +++ b/Lib/test/test_cmd_line_script.py @@ -30,17 +30,17 @@ f() assertEqual(result, ['Top level assignment', 'Lower level reference']) # Check population of magic variables assertEqual(__name__, '__main__') -print('__file__==%r' % __file__) +print('__file__==%a' % __file__) assertEqual(__cached__, None) print('__package__==%r' % __package__) # Check the sys module import sys assertIdentical(globals(), sys.modules[__name__].__dict__) -print('sys.argv[0]==%r' % sys.argv[0]) -print('sys.path[0]==%r' % sys.path[0]) +print('sys.argv[0]==%a' % sys.argv[0]) +print('sys.path[0]==%a' % sys.path[0]) # Check the working directory import os -print('cwd==%r' % os.getcwd()) +print('cwd==%a' % os.getcwd()) """ def _make_test_script(script_dir, script_basename, source=test_source): @@ -77,11 +77,11 @@ class CmdLineTest(unittest.TestCase): print("Output from test script %r:" % script_name) print(data) self.assertEqual(exit_code, 0) - printed_file = '__file__==%r' % expected_file + printed_file = '__file__==%a' % expected_file printed_package = '__package__==%r' % expected_package - printed_argv0 = 'sys.argv[0]==%r' % expected_argv0 - printed_path0 = 'sys.path[0]==%r' % expected_path0 - printed_cwd = 'cwd==%r' % os.getcwd() + printed_argv0 = 'sys.argv[0]==%a' % expected_argv0 + printed_path0 = 'sys.path[0]==%a' % expected_path0 + printed_cwd = 'cwd==%a' % os.getcwd() if verbose > 1: print('Expected output:') print(printed_file) -- cgit v0.12