traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
........
This commit is contained in:
Martin v. Löwis 2008-07-05 15:45:45 +00:00
parent ecf8d8cc4b
commit 5144ff5f78
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/lib2to3/fixes/fix_imports.py
View File

@ -19,6 +19,11 @@ builtin_names = [name for name in dir(__builtin__)
# XXX: overhead to the fixer. # XXX: overhead to the fixer.
MAPPING = {"StringIO": ("io", ["StringIO"]), MAPPING = {"StringIO": ("io", ["StringIO"]),
"cStringIO": ("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), "__builtin__" : ("builtins", builtin_names),
'copy_reg': ('copyreg', ['pickle', 'copy_reg': ('copyreg', ['pickle',
'constructor', 'constructor',

5
Lib/lib2to3/tests/test_fixers.py
View File

@ -1405,10 +1405,7 @@ class Test_xreadlines(FixerTestCase):
s = "foo(xreadlines)" s = "foo(xreadlines)"
self.unchanged(s) self.unchanged(s)
# Disable test, as it takes a too long time to run, and also class Test_imports(FixerTestCase):
# fails in 2.6.
#class Test_imports(FixerTestCase):
class Test_imports:
fixer = "imports" fixer = "imports"
from ..fixes.fix_imports import MAPPING as modules from ..fixes.fix_imports import MAPPING as modules