Merge pull request #79 from brettcannon/fix_long_call

Fix references to 'long'

Author: takluyver

libmodernize/fixes/__init__.py

@@ -8,6 +8,7 @@
     'lib2to3.fixes.fix_funcattrs',
     'lib2to3.fixes.fix_has_key',
     'lib2to3.fixes.fix_idioms',
+    'lib2to3.fixes.fix_long',
     'lib2to3.fixes.fix_methodattrs',
     'lib2to3.fixes.fix_ne',
     'lib2to3.fixes.fix_numliterals',
@@ -32,6 +33,7 @@
     'libmodernize.fixes.fix_filter',
     'libmodernize.fixes.fix_imports_six',
     'libmodernize.fixes.fix_input_six',
+    'libmodernize.fixes.fix_int_long_tuple',
     'libmodernize.fixes.fix_map',
     'libmodernize.fixes.fix_metaclass',
     'libmodernize.fixes.fix_raise_six',

libmodernize/fixes/fix_int_long_tuple.py

@@ -0,0 +1,25 @@
+from __future__ import absolute_import
+
+from lib2to3 import fixer_base
+from lib2to3 import fixer_util
+
+
+class FixIntLongTuple(fixer_base.BaseFix):
+
+    run_order = 4  # Must run before fix_long.
+
+    PATTERN = """
+    pair=atom < '(' testlist_gexp < (
+        ('int' ',' 'long') |
+        ('long' ',' 'int')
+    ) > ')' >
+    """
+
+    def transform(self, node, results):
+        if 'name' in results:
+            name = results['name']
+            name.replace(fixer_util.Name('int', prefix=name.prefix))
+        else:
+            fixer_util.touch_import(None, 'six', node)
+            pair = results['pair']
+            pair.replace(fixer_util.Name('six.integer_types', prefix=pair.prefix))

tests/test_fix_int_long_tuple.py

@@ -0,0 +1,25 @@
+from __future__ import absolute_import
+
+from utils import check_on_input
+
+
+INT_LONG_ISINSTANCE = ("""\
+isinstance(1, (int, long))
+""", """\
+import six
+isinstance(1, six.integer_types)
+""")
+
+LONG_INT_ISINSTANCE = ("""\
+isinstance(1, (long, int))
+""", """\
+import six
+isinstance(1, six.integer_types)
+""")
+
+
+def test_int_long_isinstance():
+    check_on_input(*INT_LONG_ISINSTANCE)
+
+def test_long_int_isinstance():
+    check_on_input(*LONG_INT_ISINSTANCE)