#16910: merge with 3.3.

This commit is contained in:
Ezio Melotti 2013-01-10 07:46:29 +02:00
commit 5b1acc0dff
5 changed files with 19 additions and 25 deletions

View file

@ -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()