[Python-checkins] r68422 - in sandbox/trunk/2to3/lib2to3/fixes: fix_imports.py fix_imports2.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Fri Jan  9 03:01:03 2009
New Revision: 68422

Log:
run the imports fixers after fix_import, so fix_import doesn't try to make stdlib renames into relative imports #4876

Modified:
   sandbox/trunk/2to3/lib2to3/fixes/fix_imports.py
   sandbox/trunk/2to3/lib2to3/fixes/fix_imports2.py

Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_imports.py
==============================================================================
--- sandbox/trunk/2to3/lib2to3/fixes/fix_imports.py	(original)
+++ sandbox/trunk/2to3/lib2to3/fixes/fix_imports.py	Fri Jan  9 03:01:03 2009
@@ -88,6 +88,10 @@
     # This is overridden in fix_imports2.
     mapping = MAPPING
 
+    # We want to run this fixer late, so fix_import doesn't try to make stdlib
+    # renames into relative imports.
+    run_order = 6
+
     def build_pattern(self):
         return "|".join(build_pattern(self.mapping))
 

Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_imports2.py
==============================================================================
--- sandbox/trunk/2to3/lib2to3/fixes/fix_imports2.py	(original)
+++ sandbox/trunk/2to3/lib2to3/fixes/fix_imports2.py	Fri Jan  9 03:01:03 2009
@@ -11,6 +11,6 @@
 
 class FixImports2(fix_imports.FixImports):
 
-    run_order = 6
+    run_order = 7
 
     mapping = MAPPING