]> granicus.if.org Git - python/commit
Merged revisions 67030-67031 via svnmerge from
authorBenjamin Peterson <benjamin@python.org>
Sun, 26 Oct 2008 20:59:05 +0000 (20:59 +0000)
committerBenjamin Peterson <benjamin@python.org>
Sun, 26 Oct 2008 20:59:05 +0000 (20:59 +0000)
commitb74777ed333ce2d22494fd4c996e87d386d950c8
tree5f59a0c96e3862a887dd6626dd374c7357dbcfda
parent23681daa712b42a0bd0b81efcb0ad8ca1a3ed368
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]
Misc/NEWS
Parser/parser.c