diff options
| author | Tim Peters <tim.peters@gmail.com> | 2004-07-18 00:08:11 (GMT) |
|---|---|---|
| committer | Tim Peters <tim.peters@gmail.com> | 2004-07-18 00:08:11 (GMT) |
| commit | 264c659197bcd2fc3e22776fc711f31b953daae5 (patch) | |
| tree | 890412a726fb41b27d5013f4acdea5a9fab9b7be | |
| parent | fa7809df023562780c0932bfc554ec8e6559cf37 (diff) | |
| download | cpython-264c659197bcd2fc3e22776fc711f31b953daae5.zip cpython-264c659197bcd2fc3e22776fc711f31b953daae5.tar.gz cpython-264c659197bcd2fc3e22776fc711f31b953daae5.tar.bz2 | |
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 *".
| -rw-r--r-- | Lib/test/test_pyclbr.py | 1 | ||||
| -rw-r--r-- | 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 4f2d5ea..48e8bf7 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 0d2905d..39812ac 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 |