diff options
author | Zachary Ware <zachary.ware@gmail.com> | 2015-12-04 23:33:59 -0600 |
---|---|---|
committer | Zachary Ware <zachary.ware@gmail.com> | 2015-12-04 23:33:59 -0600 |
commit | 6c537f28aace5bc42bd7616bb806c6e4120eea7a (patch) | |
tree | 349e317995bc872f228de8f4ef1abc811151261b /Lib/test/test_pyclbr.py | |
parent | ae9c6f526589ae064628647ce02bd09b62ce629f (diff) | |
parent | 0a9b40d628c390d98e293c7ba66954d5ad45f43d (diff) | |
download | cpython-6c537f28aace5bc42bd7616bb806c6e4120eea7a.tar.gz |
Closes #25795: Merge with 3.5
Diffstat (limited to 'Lib/test/test_pyclbr.py')
-rw-r--r-- | Lib/test/test_pyclbr.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_pyclbr.py b/Lib/test/test_pyclbr.py index 48bd72590f..06c10c17af 100644 --- a/Lib/test/test_pyclbr.py +++ b/Lib/test/test_pyclbr.py @@ -5,7 +5,7 @@ import sys from types import FunctionType, MethodType, BuiltinFunctionType import pyclbr -from unittest import TestCase +from unittest import TestCase, main as unittest_main StaticMethodType = type(staticmethod(lambda: None)) ClassMethodType = type(classmethod(lambda c: None)) @@ -173,4 +173,4 @@ class PyclbrTest(TestCase): if __name__ == "__main__": - unittest.main() + unittest_main() |