summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-03-05 03:30:16 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-03-05 03:30:16 (GMT)
commit3e56dbe0ed438ccbd168feb030e2e06203f446ed (patch)
tree19b27157d8422ce7da9dfebc8ab948a67d0a431b
parent26c966b91d4e87b15efb3ec0a01db34f06ff895a (diff)
downloadcpython-3e56dbe0ed438ccbd168feb030e2e06203f446ed.zip
cpython-3e56dbe0ed438ccbd168feb030e2e06203f446ed.tar.gz
cpython-3e56dbe0ed438ccbd168feb030e2e06203f446ed.tar.bz2
Merged revisions 78684 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r78684 | benjamin.peterson | 2010-03-04 21:27:12 -0600 (Thu, 04 Mar 2010) | 20 lines Merged revisions 78683 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ................ r78683 | benjamin.peterson | 2010-03-04 21:24:17 -0600 (Thu, 04 Mar 2010) | 13 lines Merged revisions 78679,78681 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r78679 | benjamin.peterson | 2010-03-04 21:10:46 -0600 (Thu, 04 Mar 2010) | 1 line set svn:eol-style ........ r78681 | benjamin.peterson | 2010-03-04 21:19:06 -0600 (Thu, 04 Mar 2010) | 1 line remove svn:executable property ........ ................ ................
-rw-r--r--[-rwxr-xr-x]Lib/lib2to3/tests/test_fixers.py0
-rw-r--r--[-rwxr-xr-x]Lib/lib2to3/tests/test_pytree.py0
2 files changed, 0 insertions, 0 deletions
diff --git a/Lib/lib2to3/tests/test_fixers.py b/Lib/lib2to3/tests/test_fixers.py
index a92f14a..a92f14a 100755..100644
--- a/Lib/lib2to3/tests/test_fixers.py
+++ b/Lib/lib2to3/tests/test_fixers.py
diff --git a/Lib/lib2to3/tests/test_pytree.py b/Lib/lib2to3/tests/test_pytree.py
index 870970c..870970c 100755..100644
--- a/Lib/lib2to3/tests/test_pytree.py
+++ b/Lib/lib2to3/tests/test_pytree.py