[Python-checkins] r64736 - in python/trunk/Lib/lib2to3: fixes/fix_imports.py tests/test_fixers.py

Sat Jul 5 17:45:46 CEST 2008

Author: martin.v.loewis
Date: Sat Jul 5 17:45:45 2008
New Revision: 64736
Log:
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.
........
Modified:
 python/trunk/Lib/lib2to3/ (props changed)
 python/trunk/Lib/lib2to3/fixes/fix_imports.py
 python/trunk/Lib/lib2to3/tests/test_fixers.py
Modified: python/trunk/Lib/lib2to3/fixes/fix_imports.py
==============================================================================

--- python/trunk/Lib/lib2to3/fixes/fix_imports.py	(original)
+++ python/trunk/Lib/lib2to3/fixes/fix_imports.py	Sat Jul 5 17:45:45 2008
@@ -19,6 +19,11 @@
 # 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',
Modified: python/trunk/Lib/lib2to3/tests/test_fixers.py
==============================================================================
--- python/trunk/Lib/lib2to3/tests/test_fixers.py	(original)
+++ python/trunk/Lib/lib2to3/tests/test_fixers.py	Sat Jul 5 17:45:45 2008
@@ -1405,10 +1405,7 @@
 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
 
