Merge pull request #596 from schuhschuh/fix-python-future-statements

fix: Recognize future statements with comma separated list of imports [Modules]
cmake-basis · May 4, 2016 · 0d2d0aa · 0d2d0aa
2 parents 9e22d7d + 6ee3e53
commit 0d2d0aa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/cmake/modules/CommonTools.cmake b/src/cmake/modules/CommonTools.cmake
@@ -3188,7 +3188,7 @@ function (basis_configure_script INPUT OUTPUT)
         # insert extra Python code near top, but after any future statement
         # (http://docs.python.org/2/reference/simple_stmts.html#future)
         set (FUTURE_STATEMENTS)
-        if (SCRIPT MATCHES "^(.*from[ \t]+__future__[ \t]+import[ \t]+[a-z_]+([ \t]+as[ \t]+[a-zA-Z_]+)?[ \t]*\n)(.*)$")
+        if (SCRIPT MATCHES "^(.*from[ \t]+__future__[ \t]+import[ \t]+[a-z_]+[^\n]*\n)(.*)$")
           set (FUTURE_STATEMENTS "${CMAKE_MATCH_1}")
           set (SCRIPT            "${CMAKE_MATCH_3}")
         endif ()

diff --git a/test/cmake/test_future_statements.py b/test/cmake/test_future_statements.py
@@ -19,13 +19,14 @@
 from __future__ import division
 
 
-from __future__ import generators
+from __future__ import generators, with_statement
 from __future__ import unicode_literals
 
 
 
 from __future__ import with_statement
 
+from __future__ import print_function, division, unicode_literals
 
 
 from basis import utilities