diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-01-10 05:46:29 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-01-10 05:46:29 (GMT) |
| commit | 5b1acc0dff9b242cc6e5f7c7aa1a19f361f98004 (patch) | |
| tree | 780c90cc38575904d739069ad11c3b04db4b756c /Lib/test/test_unicode.py | |
| parent | 47b988609f5669ed2788a3c5c6004b13a3c2cff0 (diff) | |
| parent | 0dceb560b6b7bfc0a2e11d3a6c27f0a7c7e2e619 (diff) | |
| download | cpython-5b1acc0dff9b242cc6e5f7c7aa1a19f361f98004.zip cpython-5b1acc0dff9b242cc6e5f7c7aa1a19f361f98004.tar.gz cpython-5b1acc0dff9b242cc6e5f7c7aa1a19f361f98004.tar.bz2 | |
#16910: merge with 3.3.
Diffstat (limited to 'Lib/test/test_unicode.py')
| -rw-r--r-- | Lib/test/test_unicode.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py index 058c83a..2d42aac 100644 --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -33,7 +33,8 @@ codecs.register(search_function) class UnicodeTest(string_tests.CommonTest, string_tests.MixinStrUnicodeUserStringTest, - string_tests.MixinStrUnicodeTest): + string_tests.MixinStrUnicodeTest, + unittest.TestCase): type2test = str @@ -2242,8 +2243,5 @@ class StringModuleTest(unittest.TestCase): self.assertRaises(TypeError, _string.formatter_field_name_split, 1) -def test_main(): - support.run_unittest(__name__) - if __name__ == "__main__": - test_main() + unittest.main() |