fix __future__ imports when multiple features are given

benjamin.peterson · benjamin.peterson · commit d4a5a67e727b · 2008-10-26T20:21:13.000Z
git-svn-id: http://svn.python.org/projects/python/trunk@67030 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Lib/test/test_future.py b/Lib/test/test_future.py
@@ -89,19 +89,23 @@ def test_parserhack(self):
         #       the parser hack disabled. If a new keyword is introduced in
         #       2.6, change this to refer to the new future import.
         try:
-            exec "from __future__ import division, with_statement; with = 0"
+            exec "from __future__ import print_function; print 0"
         except SyntaxError:
             pass
         else:
             self.fail("syntax error didn't occur")
 
         try:
-            exec "from __future__ import (with_statement, division); with = 0"
+            exec "from __future__ import (print_function); print 0"
         except SyntaxError:
             pass
         else:
             self.fail("syntax error didn't occur")
 
+    def test_multiple_features(self):
+        test_support.unload("test.test_future5")
+        from test import test_future5
+
 
 def test_main():
     test_support.run_unittest(FutureTest)
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 2.7 alpha 1
 Core and Builtins
 -----------------
 
+- Issue #4209: Enabling unicode_literals and the print_function in the same
+  __future__ import didn't work.
+
 - Using ``nonlocal`` as a variable name will now raise a Py3k SyntaxWarning
   because it is a reserved word in 3.x.
 
diff --git a/Parser/parser.c b/Parser/parser.c
@@ -206,13 +206,10 @@ future_hack(parser_state *ps)
 			char *str_ch = STR(CHILD(cch, 0));
 			if (strcmp(str_ch, FUTURE_WITH_STATEMENT) == 0) {
 				ps->p_flags |= CO_FUTURE_WITH_STATEMENT;
-				break;
 			} else if (strcmp(str_ch, FUTURE_PRINT_FUNCTION) == 0) {
 				ps->p_flags |= CO_FUTURE_PRINT_FUNCTION;
-				break;
 			} else if (strcmp(str_ch, FUTURE_UNICODE_LITERALS) == 0) {
 				ps->p_flags |= CO_FUTURE_UNICODE_LITERALS;
-				break;
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -206,13 +206,10 @@ future_hack(parser_state *ps)`
`206`	`206`	`char *str_ch = STR(CHILD(cch, 0));`
`207`	`207`	`if (strcmp(str_ch, FUTURE_WITH_STATEMENT) == 0) {`
`208`	`208`	`ps->p_flags \|= CO_FUTURE_WITH_STATEMENT;`
`209`		`- break;`
`210`	`209`	`} else if (strcmp(str_ch, FUTURE_PRINT_FUNCTION) == 0) {`
`211`	`210`	`ps->p_flags \|= CO_FUTURE_PRINT_FUNCTION;`
`212`		`- break;`
`213`	`211`	`} else if (strcmp(str_ch, FUTURE_UNICODE_LITERALS) == 0) {`
`214`	`212`	`ps->p_flags \|= CO_FUTURE_UNICODE_LITERALS;`
`215`		`- break;`
`216`	`213`	`}`
`217`	`214`	`}`
`218`	`215`	`}`