From b4e87e379219afd6ef1a0fba400275fa22180c63 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Mon, 9 Jul 2007 10:08:42 +0000 Subject: [PATCH] Make test_optparse pass. --- Lib/test/test_optparse.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Lib/test/test_optparse.py b/Lib/test/test_optparse.py index b196ec96ed7..2bae0a64b79 100644 --- a/Lib/test/test_optparse.py +++ b/Lib/test/test_optparse.py @@ -1463,10 +1463,6 @@ class TestHelp(BaseTest): os.environ['COLUMNS'] = orig_columns def assertHelpEquals(self, expected_output): - if isinstance(expected_output, unicode): - encoding = self.parser._get_encoding(sys.stdout) - expected_output = expected_output.encode(encoding, "replace") - save_argv = sys.argv[:] try: # Make optparse believe bar.py is being executed. @@ -1595,7 +1591,7 @@ class TestParseNumber(BaseTest): self.assertRaises( _parse_num, ("0xOoops", int), {}, ValueError, - re.compile(r"invalid literal for int().*: '?0xOoops'?")) + re.compile(r"invalid literal for int().*: s?'?0xOoops'?")) def test_parse_num_ok(self): self.assertEqual(_parse_num("0", int), 0)