summaryrefslogtreecommitdiffstats
path: root/Lib/__future__.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-07-04 16:44:15 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-07-04 16:44:15 (GMT)
commit766f5d9d736ae37167534fbb2484b6dbcb70bd34 (patch)
treeff69fe82994e677e1d5f6603604764170a7f2342 /Lib/__future__.py
parente2f44beebd65f814b8b768707e8d54dbd99fbfb1 (diff)
downloadcpython-766f5d9d736ae37167534fbb2484b6dbcb70bd34.zip
cpython-766f5d9d736ae37167534fbb2484b6dbcb70bd34.tar.gz
cpython-766f5d9d736ae37167534fbb2484b6dbcb70bd34.tar.bz2
Merged revisions 81478,82530-82531 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r81478 | benjamin.peterson | 2010-05-22 13:47:39 -0500 (Sat, 22 May 2010) | 1 line ensure doctests have some future_features ........ r82530 | benjamin.peterson | 2010-07-04 11:11:41 -0500 (Sun, 04 Jul 2010) | 1 line simplify ignore star imports from itertools #8892 ........ r82531 | benjamin.peterson | 2010-07-04 11:13:20 -0500 (Sun, 04 Jul 2010) | 1 line wrap with parenthesis not \ ........
Diffstat (limited to 'Lib/__future__.py')
0 files changed, 0 insertions, 0 deletions