Closes #25795: Merge with 3.5

This commit is contained in:
Zachary Ware 2015-12-04 23:33:59 -06:00
commit 2d2af91da0
8 changed files with 13 additions and 7 deletions

View file

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