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
........
This commit is contained in:
Benjamin Peterson 2008-10-26 20:58:53 +00:00
parent cff882ce21
commit 9aebc61ad8
3 changed files with 27 additions and 5 deletions

View file

@ -89,19 +89,23 @@ class FutureTest(unittest.TestCase):
# 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):
support.unload("test.test_future5")
from test import test_future5
def test_main():
support.run_unittest(FutureTest)