summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-03-05 03:24:17 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-03-05 03:24:17 (GMT)
commit2bb66e03b72ae5a0468dab0b7020316f31c8cfdf (patch)
treef81853617e76ed5348ab792f02912fe1d40232e3 /Lib
parentb3be23ad27f35bae55638e2ccf0bbb121d8e66ed (diff)
downloadcpython-2bb66e03b72ae5a0468dab0b7020316f31c8cfdf.zip
cpython-2bb66e03b72ae5a0468dab0b7020316f31c8cfdf.tar.gz
cpython-2bb66e03b72ae5a0468dab0b7020316f31c8cfdf.tar.bz2
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 ........
Diffstat (limited to 'Lib')
-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 417ed2f..417ed2f 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