Merge pull request #64 from brettcannon/fix_input

Add a fixer for input() and raw_input()

Author: takluyver

libmodernize/fixes/__init__.py

@@ -31,6 +31,7 @@
     'libmodernize.fixes.fix_basestring',
     'libmodernize.fixes.fix_dict',
     'libmodernize.fixes.fix_filter',
+    'libmodernize.fixes.fix_input_six',
     'libmodernize.fixes.fix_map',
     'libmodernize.fixes.fix_metaclass',
     'libmodernize.fixes.fix_raise_six',

libmodernize/fixes/fix_input_six.py

@@ -0,0 +1,39 @@
+# This is a derived work of Lib/lib2to3/fixes/fix_input.py and
+# Lib/lib2to3/fixes/fix_raw_input.py under the
+# copyright of the Python Software Foundation, licensed under the Python
+# Software Foundation License 2.
+#
+# Copyright notice:
+#
+#     Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#     2011, 2012, 2013, 2014 Python Software Foundation. All rights reserved.
+#
+# Full license text: http://docs.python.org/3.4/license.html
+
+from lib2to3 import fixer_base
+from lib2to3.fixer_util import Call, Name, touch_import
+
+
+class FixInputSix(fixer_base.ConditionalFix):
+
+    BM_compatible = True
+    order = 'pre'
+    skip_on = 'six.moves.input'
+
+    PATTERN = """
+              power< (name='input' | name='raw_input')
+                trailer< '(' [any] ')' > any* >
+              """
+
+    def transform(self, node, results):
+        if self.should_skip(node):
+            return
+
+        touch_import(u'six.moves', u'input', node)
+        name = results['name']
+        if name.value == 'raw_input':
+            name.replace(Name('input', prefix=name.prefix))
+        else:
+            new_node = node.clone()
+            new_node.prefix = ''
+            return Call(Name('eval'), [new_node], prefix=node.prefix)

tests/test_fix_input_six.py

@@ -0,0 +1,55 @@
+from utils import check_on_input
+
+
+INPUT = ("""\
+input()
+""", """\
+from six.moves import input
+eval(input())
+""")
+
+INPUT_ARGS = ("""\
+input('hello')
+""", """\
+from six.moves import input
+eval(input('hello'))
+""")
+
+RAW_INPUT = ("""\
+raw_input()
+""", """\
+from six.moves import input
+input()
+""")
+
+RAW_INPUT_TRAILER = ("""\
+raw_input()[0]
+""", """\
+from six.moves import input
+input()[0]
+""")
+
+RAW_INPUT_INPUT = ("""\
+raw_input()
+input()
+""", """\
+from six.moves import input
+input()
+eval(input())
+""")
+
+
+def test_input():
+    check_on_input(*INPUT)
+
+def test_input_args():
+    check_on_input(*INPUT_ARGS)
+
+def test_raw_input():
+    check_on_input(*RAW_INPUT)
+
+def test_raw_input_trailer():
+    check_on_input(*RAW_INPUT_TRAILER)
+
+def test_raw_input_input():
+    check_on_input(*RAW_INPUT_INPUT)