diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-07-05 15:45:45 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-07-05 15:45:45 (GMT) |
| commit | 5144ff5f78ce41415350d74a992089a9ed096051 (patch) | |
| tree | 4e6d391b7f3b4d12a4e5ddab34b667633ae18f63 /Lib/lib2to3 | |
| parent | ecf8d8cc4bc62f7c93c3714b61ff354c37cd5504 (diff) | |
| download | cpython-5144ff5f78ce41415350d74a992089a9ed096051.zip cpython-5144ff5f78ce41415350d74a992089a9ed096051.tar.gz cpython-5144ff5f78ce41415350d74a992089a9ed096051.tar.bz2 | |
Merged revisions 64285-64735 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r64493 | benjamin.peterson | 2008-06-24 04:14:14 +0200 (Di, 24 Jun 2008) | 1 line
add a fix_import mapping for cPickle -> pickle
........
r64651 | brett.cannon | 2008-07-02 04:00:11 +0200 (Mi, 02 Jul 2008) | 3 lines
Update fix_imports for urllib. Had to change the fixer itself to handle modules
that are split across several renames in 3.0.
........
r64669 | brett.cannon | 2008-07-02 21:43:48 +0200 (Mi, 02 Jul 2008) | 4 lines
Backing out last change until fix_imports is working again. Also re-enable the
testing for fix_imports; if it is deemed that it takes too long to run then a
random sample should be taken and used to test it.
........
Diffstat (limited to 'Lib/lib2to3')
| -rw-r--r-- | Lib/lib2to3/fixes/fix_imports.py | 5 | ||||
| -rwxr-xr-x | Lib/lib2to3/tests/test_fixers.py | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Lib/lib2to3/fixes/fix_imports.py b/Lib/lib2to3/fixes/fix_imports.py index b4a137b..94b2311 100644 --- a/Lib/lib2to3/fixes/fix_imports.py +++ b/Lib/lib2to3/fixes/fix_imports.py @@ -19,6 +19,11 @@ builtin_names = [name for name in dir(__builtin__) # XXX: overhead to the fixer. MAPPING = {"StringIO": ("io", ["StringIO"]), "cStringIO": ("io", ["StringIO"]), + "cPickle": ("pickle", ['BadPickleGet', 'HIGHEST_PROTOCOL', + 'PickleError', 'Pickler', 'PicklingError', + 'UnpickleableError', 'Unpickler', 'UnpicklingError', + 'compatible_formats', 'dump', 'dumps', 'format_version', + 'load', 'loads']), "__builtin__" : ("builtins", builtin_names), 'copy_reg': ('copyreg', ['pickle', 'constructor', diff --git a/Lib/lib2to3/tests/test_fixers.py b/Lib/lib2to3/tests/test_fixers.py index bb5c79a..3ed8cd5 100755 --- a/Lib/lib2to3/tests/test_fixers.py +++ b/Lib/lib2to3/tests/test_fixers.py @@ -1405,10 +1405,7 @@ class Test_xreadlines(FixerTestCase): s = "foo(xreadlines)" self.unchanged(s) -# Disable test, as it takes a too long time to run, and also -# fails in 2.6. -#class Test_imports(FixerTestCase): -class Test_imports: +class Test_imports(FixerTestCase): fixer = "imports" from ..fixes.fix_imports import MAPPING as modules |