Actually add fix_apply to stage 1 (and fix its test)

edschofield · edschofield · commit a50f5b89a04a · 2013-10-29T12:59:08.000+11:00
diff --git a/future/tests/test_futurize.py b/future/tests/test_futurize.py
@@ -286,7 +286,9 @@ def test_Py2_StringIO_module(self):
         after = """
         import io
         s = io.StringIO('my string')
-        assert isinstance(s, io.InputType)
+        # assert isinstance(s, io.InputType)
+        # There is no io.InputType in Python 3. What should we change this to
+        # instead?
         """
         self.convert_check(before, after)
 
@@ -319,6 +321,7 @@ def f(a, b):
             return a + b
 
         args = (1, 2)
+        assert f(*args) == 3
         assert f(*('a', 'b')) == 'ab'
         '''
         self.convert_check(before, after, stages=[1])
diff --git a/libfuturize/fixes2/__init__.py b/libfuturize/fixes2/__init__.py
@@ -6,6 +6,7 @@
 # projects that are happy to drop support for Py2.5 and below. Applying
 # them first will reduce the size of the patch set for the real porting.
 lib2to3_fix_names_stage1 = set([
+    'lib2to3.fixes.fix_apply',
     'lib2to3.fixes.fix_except',
     'lib2to3.fixes.fix_execfile',
     'lib2to3.fixes.fix_exitfunc',
@@ -37,7 +38,6 @@
 
 # The following fixers add a dependency on the ``future`` package:
 lib2to3_fix_names_stage2 = set([
-    'lib2to3.fixes.fix_apply',
     'lib2to3.fixes.fix_basestring',
     # 'lib2to3.fixes.fix_buffer',    # perhaps not safe. Test this.
     # 'lib2to3.fixes.fix_callable',  # not needed in Py3.2+
