[Python-checkins] r83857 - in sandbox/trunk/2to3/lib2to3/fixes: fix_callable.py fix_intern.py fix_operator.py fix_reduce.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Sun Aug  8 22:59:49 2010
New Revision: 83857

Log:
things which use touch_import should be pre order

Modified:
   sandbox/trunk/2to3/lib2to3/fixes/fix_callable.py
   sandbox/trunk/2to3/lib2to3/fixes/fix_intern.py
   sandbox/trunk/2to3/lib2to3/fixes/fix_operator.py
   sandbox/trunk/2to3/lib2to3/fixes/fix_reduce.py

Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_callable.py
==============================================================================
--- sandbox/trunk/2to3/lib2to3/fixes/fix_callable.py	(original)
+++ sandbox/trunk/2to3/lib2to3/fixes/fix_callable.py	Sun Aug  8 22:59:49 2010
@@ -12,6 +12,8 @@
 
 class FixCallable(fixer_base.BaseFix):
 
+    order = "pre"
+
     # Ignore callable(*args) or use of keywords.
     # Either could be a hint that the builtin callable() is not being used.
     PATTERN = """

Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_intern.py
==============================================================================
--- sandbox/trunk/2to3/lib2to3/fixes/fix_intern.py	(original)
+++ sandbox/trunk/2to3/lib2to3/fixes/fix_intern.py	Sun Aug  8 22:59:49 2010
@@ -13,6 +13,8 @@
 
 class FixIntern(fixer_base.BaseFix):
 
+    order = "pre"
+
     PATTERN = """
     power< 'intern'
            trailer< lpar='('

Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_operator.py
==============================================================================
--- sandbox/trunk/2to3/lib2to3/fixes/fix_operator.py	(original)
+++ sandbox/trunk/2to3/lib2to3/fixes/fix_operator.py	Sun Aug  8 22:59:49 2010
@@ -16,6 +16,8 @@
 
 class FixOperator(fixer_base.BaseFix):
 
+    order = "pre"
+
     methods = """
               method=('isCallable'|'sequenceIncludes'
                      |'isSequenceType'|'isMappingType'|'isNumberType'

Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_reduce.py
==============================================================================
--- sandbox/trunk/2to3/lib2to3/fixes/fix_reduce.py	(original)
+++ sandbox/trunk/2to3/lib2to3/fixes/fix_reduce.py	Sun Aug  8 22:59:49 2010
@@ -14,6 +14,8 @@
 
 class FixReduce(fixer_base.BaseFix):
 
+    order = "pre"
+
     PATTERN = """
     power< 'reduce'
         trailer< '('