diff -r 0c04ed40eeaf Lib/test/string_tests.py --- a/Lib/test/string_tests.py Wed Jan 09 09:52:22 2013 -0600 +++ b/Lib/test/string_tests.py Wed Jan 09 10:56:56 2013 -0600 @@ -19,7 +19,7 @@ def __init__(self): self.seq = ['a', 'b', 'c'] def __len__(self): return 8 -class BaseTest(unittest.TestCase): +class BaseTest: # These tests are for buffers of values (bytes) and not # specific to character interpretation, used for bytes objects # and various string implementations diff -r 0c04ed40eeaf Lib/test/test_bytes.py --- a/Lib/test/test_bytes.py Wed Jan 09 09:52:22 2013 -0600 +++ b/Lib/test/test_bytes.py Wed Jan 09 10:56:56 2013 -0600 @@ -38,7 +38,7 @@ return self.value -class BaseBytesTest(unittest.TestCase): +class BaseBytesTest: def test_basics(self): b = self.type2test() @@ -696,7 +696,7 @@ x, None, None, None) -class BytesTest(BaseBytesTest): +class BytesTest(BaseBytesTest, unittest.TestCase): type2test = bytes def test_buffer_is_readonly(self): @@ -744,7 +744,7 @@ b's:cstr') -class ByteArrayTest(BaseBytesTest): +class ByteArrayTest(BaseBytesTest, unittest.TestCase): type2test = bytearray def test_nohash(self): @@ -1312,16 +1312,16 @@ def test_lower(self): pass -class ByteArrayAsStringTest(FixedStringTest): +class ByteArrayAsStringTest(FixedStringTest, unittest.TestCase): type2test = bytearray contains_bytes = True -class BytesAsStringTest(FixedStringTest): +class BytesAsStringTest(FixedStringTest, unittest.TestCase): type2test = bytes contains_bytes = True -class SubclassTest(unittest.TestCase): +class SubclassTest: def test_basic(self): self.assertTrue(issubclass(self.subclass2test, self.type2test)) @@ -1393,7 +1393,7 @@ class BytesSubclass(bytes): pass -class ByteArraySubclassTest(SubclassTest): +class ByteArraySubclassTest(SubclassTest, unittest.TestCase): type2test = bytearray subclass2test = ByteArraySubclass @@ -1408,16 +1408,10 @@ self.assertEqual(x, b"abcd") -class BytesSubclassTest(SubclassTest): +class BytesSubclassTest(SubclassTest, unittest.TestCase): type2test = bytes subclass2test = BytesSubclass -def test_main(): - test.support.run_unittest( - BytesTest, AssortedBytesTest, BytesAsStringTest, - ByteArrayTest, ByteArrayAsStringTest, BytesSubclassTest, - ByteArraySubclassTest, BytearrayPEP3137Test) - if __name__ == "__main__": - test_main() + unittest.main() diff -r 0c04ed40eeaf Lib/test/test_unicode.py --- a/Lib/test/test_unicode.py Wed Jan 09 09:52:22 2013 -0600 +++ b/Lib/test/test_unicode.py Wed Jan 09 10:56:56 2013 -0600 @@ -33,7 +33,8 @@ class UnicodeTest(string_tests.CommonTest, string_tests.MixinStrUnicodeUserStringTest, - string_tests.MixinStrUnicodeTest): + string_tests.MixinStrUnicodeTest, + unittest.TestCase): type2test = str @@ -2242,8 +2243,5 @@ self.assertRaises(TypeError, _string.formatter_field_name_split, 1) -def test_main(): - support.run_unittest(__name__) - if __name__ == "__main__": - test_main() + unittest.main() diff -r 0c04ed40eeaf Lib/test/test_userstring.py --- a/Lib/test/test_userstring.py Wed Jan 09 09:52:22 2013 -0600 +++ b/Lib/test/test_userstring.py Wed Jan 09 10:56:56 2013 -0600 @@ -3,6 +3,7 @@ # UserString instances should behave similar to builtin string objects. import string +import unittest from test import support, string_tests from collections import UserString @@ -10,6 +11,7 @@ class UserStringTest( string_tests.CommonTest, string_tests.MixinStrUnicodeUserStringTest, + unittest.TestCase ): type2test = UserString @@ -42,8 +44,5 @@ getattr(object, methodname)(*args) -def test_main(): - support.run_unittest(UserStringTest) - if __name__ == "__main__": - test_main() + unittest.main()