From 264c659197bcd2fc3e22776fc711f31b953daae5 Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Sun, 18 Jul 2004 00:08:11 +0000
Subject: [PATCH] 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 *".

---
 Lib/test/test_pyclbr.py | 1 +
 Lib/types.py            | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Lib/test/test_pyclbr.py b/Lib/test/test_pyclbr.py
index 4f2d5ea60a3..48e8bf7d635 100644
--- 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 0d2905d8153..39812ac3228 100644
--- 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