diff options
Diffstat (limited to 'Lib/test/test_optparse.py')
| -rw-r--r-- | Lib/test/test_optparse.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/Lib/test/test_optparse.py b/Lib/test/test_optparse.py index 751f7a2..b196ec9 100644 --- a/Lib/test/test_optparse.py +++ b/Lib/test/test_optparse.py @@ -12,7 +12,6 @@ import sys import os import re import copy -import types import unittest from StringIO import StringIO @@ -171,7 +170,7 @@ and kwargs %(kwargs)r except InterceptedError as err: self.assert_( - type(output) is types.StringType, + isinstance(output, str), "expected output to be an ordinary string, not %r" % type(output)) @@ -432,18 +431,12 @@ class TestTypeAliases(BaseTest): self.parser.add_option("-s", type="str") self.assertEquals(self.parser.get_option("-s").type, "string") - def test_new_type_object(self): + def test_type_object(self): self.parser.add_option("-s", type=str) self.assertEquals(self.parser.get_option("-s").type, "string") self.parser.add_option("-x", type=int) self.assertEquals(self.parser.get_option("-x").type, "int") - def test_old_type_object(self): - self.parser.add_option("-s", type=types.StringType) - self.assertEquals(self.parser.get_option("-s").type, "string") - self.parser.add_option("-x", type=types.IntType) - self.assertEquals(self.parser.get_option("-x").type, "int") - # Custom type for testing processing of default values. _time_units = { 's' : 1, 'm' : 60, 'h' : 60*60, 'd' : 60*60*24 } @@ -1470,7 +1463,7 @@ class TestHelp(BaseTest): os.environ['COLUMNS'] = orig_columns def assertHelpEquals(self, expected_output): - if type(expected_output) is types.UnicodeType: + if isinstance(expected_output, unicode): encoding = self.parser._get_encoding(sys.stdout) expected_output = expected_output.encode(encoding, "replace") |