summaryrefslogtreecommitdiff
path: root/Lib/test/test_optparse.py
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/test/test_optparse.py')
-rw-r--r--Lib/test/test_optparse.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/Lib/test/test_optparse.py b/Lib/test/test_optparse.py
index b196ec96ed..2bae0a64b7 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)