summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_unicode.py
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-01-10 05:43:26 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-01-10 05:43:26 (GMT)
commit0dceb560b6b7bfc0a2e11d3a6c27f0a7c7e2e619 (patch)
tree6b3ba08afc6eed3ffd91535a707637e39577b315 /Lib/test/test_unicode.py
parent2688e810643cd0965926912862c6ab225fc2c974 (diff)
downloadcpython-0dceb560b6b7bfc0a2e11d3a6c27f0a7c7e2e619.zip
cpython-0dceb560b6b7bfc0a2e11d3a6c27f0a7c7e2e619.tar.gz
cpython-0dceb560b6b7bfc0a2e11d3a6c27f0a7c7e2e619.tar.bz2
#16910: test_bytes, test_unicode, and test_userstring now work with unittest test discovery. Patch by Zachary Ware.
Diffstat (limited to 'Lib/test/test_unicode.py')
-rw-r--r--Lib/test/test_unicode.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 9aaedd3..8fccab3 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
@@ -2218,8 +2219,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()