[Python-checkins] r67033 - in python/branches/release26-maint: Lib/test/test_future.py Lib/test/test_future5.py Misc/NEWS Parser/parser.c

[benjamin.peterson]

Author: benjamin.peterson
Date: Sun Oct 26 21:59:05 2008
New Revision: 67033

Log:
Merged revisions 67030-67031 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67030 | benjamin.peterson | 2008-10-26 15:21:13 -0500 (Sun, 26 Oct 2008) | 1 line
  
  fix __future__ imports when multiple features are given
........
  r67031 | benjamin.peterson | 2008-10-26 15:33:19 -0500 (Sun, 26 Oct 2008) | 1 line
  
  add forgotten test for r67030
........


Added:
   python/branches/release26-maint/Lib/test/test_future5.py
      - copied unchanged from r67031, /python/trunk/Lib/test/test_future5.py
Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/test/test_future.py
   python/branches/release26-maint/Misc/NEWS
   python/branches/release26-maint/Parser/parser.c

Modified: python/branches/release26-maint/Lib/test/test_future.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_future.py	(original)
+++ python/branches/release26-maint/Lib/test/test_future.py	Sun Oct 26 21:59:05 2008
@@ -89,19 +89,23 @@
         #       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)

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Sun Oct 26 21:59:05 2008
@@ -12,6 +12,9 @@
 Core and Builtins
 -----------------
 
+- Issue #4209: Enabling unicode_literals and the print_function in the same
+  __future__ import didn't work.
+
 - On windows, os.chdir given unicode was not working if GetCurrentDirectoryW
   returned a path longer than MAX_PATH. (But It's doubtful this code path is
   really executed because I cannot move to such directory on win2k)

Modified: python/branches/release26-maint/Parser/parser.c
==============================================================================
--- python/branches/release26-maint/Parser/parser.c	(original)
+++ python/branches/release26-maint/Parser/parser.c	Sun Oct 26 21:59:05 2008
@@ -206,13 +206,10 @@
 			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;
 			}
 		}
 	}