]> granicus.if.org Git - python/commit
Merged revisions 67030-67031 via svnmerge from
authorBenjamin Peterson <benjamin@python.org>
Sun, 26 Oct 2008 20:58:53 +0000 (20:58 +0000)
committerBenjamin Peterson <benjamin@python.org>
Sun, 26 Oct 2008 20:58:53 +0000 (20:58 +0000)
commit9aebc61ad8e3b0eddd43dc563380025cc2fd8d02
tree95a3c735956df93136a3604b56510f3f103f636c
parentcff882ce21f0870da9f59f4e1dad094caa379f5a
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
........
Lib/test/test_future.py
Lib/test/test_future5.py [new file with mode: 0644]
Parser/parser.c