Merge pull request #117 from takluyver/future-import-paren

Handle parenthesised future imports

Author: brettcannon

libmodernize/__init__.py

@@ -19,8 +19,15 @@ def check_future_import(node):
             node.children[1].type == token.NAME and
             node.children[1].value == u'__future__'):
         return set()
-    node = node.children[3]
+
+    if node.children[3].type == token.LPAR:
+        # from __future__ import (..
+        node = node.children[4]
+    else:
+        # from __future__ import ...
+        node = node.children[3]
     # now node is the import_as_name[s]
+
     # print(python_grammar.number2symbol[node.type])
     if node.type == syms.import_as_names:
         result = set()

tests/test_future_behaviour.py

@@ -111,8 +111,22 @@ def test_problematic_file():
 print("abc")
 """)
 
+FUTURE_IMPORT_PAREN = ("""\
+from __future__ import (absolute_import, division, print_function)
+unicode("abc")
+""", """\
+from __future__ import (absolute_import, division, print_function)
+import six
+six.text_type("abc")
+"""
+)
+
 def test_future_import_as():
     check_on_input(*FUTURE_IMPORT_AS)
 
 def test_future_import_as_multiple():
     check_on_input(*FUTURE_IMPORT_AS_MULTIPLE)
+
+def test_future_import_paren():
+    check_on_input(*FUTURE_IMPORT_PAREN)
+