Oops! Restored the pickle test to test_pyclbr, but changed types.py so

that pyclbr doesn't need to special-case modules that do "from types
import *".

diff --git a/Lib/test/test_pyclbr.py b/Lib/test/test_pyclbr.py
index 4f2d5ea60a3ac8a73e8743bf4afa4041d20b0cdb..48e8bf7d6352952849266a7a9f04249973bba20b 100644 (file)
--- a/Lib/test/test_pyclbr.py
+++ b/Lib/test/test_pyclbr.py
@@ -142,6 +142,7 @@ class PyclbrTest(TestCase):
         cm('urllib', ignore=('getproxies_registry',
                              'open_https',
                              'getproxies_internetconfig',)) # not on all platforms
+        cm('pickle')
         cm('aifc', ignore=('openfp',))  # set with = in module
         cm('Cookie')
         cm('sre_parse', ignore=('dump',)) # from sre_constants import *

diff --git a/Lib/types.py b/Lib/types.py
index 0d2905d81536c8b5ff2cf70f338f6555577ea276..39812ac3228d17f26eea573bd9093eddef512c28 100644 (file)
--- a/Lib/types.py
+++ b/Lib/types.py
@@ -48,10 +48,9 @@ except RuntimeError:
     # Execution in restricted environment
     pass
 
-def g():
+def _g():
     yield 1
-GeneratorType = type(g())
-del g
+GeneratorType = type(_g())
 
 class _C:
     def _m(self): pass
@@ -87,4 +86,4 @@ EllipsisType = type(Ellipsis)
 DictProxyType = type(TypeType.__dict__)
 NotImplementedType = type(NotImplemented)
 
-del sys, _f, _C, _x                  # Not for export
+del sys, _f, _g, _C, _x                  # Not for export