diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-12-04 02:24:43 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-12-04 02:24:43 (GMT) |
| commit | 76f05b70d7ab439fd56ec07ca2770649980f1800 (patch) | |
| tree | c762c81d087fa26607410b9c5b08c59ae58d4c21 /Lib/lib2to3/tests | |
| parent | 36a508fee63f4bbd5cc816f2a55d2197d6e34976 (diff) | |
| download | cpython-76f05b70d7ab439fd56ec07ca2770649980f1800.zip cpython-76f05b70d7ab439fd56ec07ca2770649980f1800.tar.gz cpython-76f05b70d7ab439fd56ec07ca2770649980f1800.tar.bz2 | |
Merged revisions 87002 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r87002 | martin.v.loewis | 2010-12-03 17:11:07 -0600 (Fri, 03 Dec 2010) | 21 lines
Merged revisions 85551,86156-86157,86464 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r85551 | benjamin.peterson | 2010-10-15 23:57:29 +0200 (Fr, 15 Okt 2010) | 1 line
escape() is now in the html module
........
r86156 | georg.brandl | 2010-11-04 09:34:57 +0100 (Do, 04 Nov 2010) | 1 line
Consistency fixes in option parser help texts.
........
r86157 | georg.brandl | 2010-11-04 09:35:30 +0100 (Do, 04 Nov 2010) | 1 line
#10286: fix urllib class names.
........
r86464 | benjamin.peterson | 2010-11-14 16:28:52 +0100 (So, 14 Nov 2010) | 1 line
match only .py files #10416
........
................
Diffstat (limited to 'Lib/lib2to3/tests')
| -rw-r--r-- | Lib/lib2to3/tests/test_refactor.py | 1 | ||||
| -rw-r--r-- | Lib/lib2to3/tests/test_util.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Lib/lib2to3/tests/test_refactor.py b/Lib/lib2to3/tests/test_refactor.py index 35efe25..73122d8 100644 --- a/Lib/lib2to3/tests/test_refactor.py +++ b/Lib/lib2to3/tests/test_refactor.py @@ -223,6 +223,7 @@ from __future__ import print_function""" "hi.py", ".dumb", ".after.py", + "notpy.npy", "sappy"] expected = ["hi.py"] check(tree, expected) diff --git a/Lib/lib2to3/tests/test_util.py b/Lib/lib2to3/tests/test_util.py index 0ab7537..d2be82c 100644 --- a/Lib/lib2to3/tests/test_util.py +++ b/Lib/lib2to3/tests/test_util.py @@ -568,8 +568,8 @@ class Test_touch_import(support.TestCase): def test_from_import(self): node = parse('bar()') - fixer_util.touch_import("cgi", "escape", node) - self.assertEqual(str(node), 'from cgi import escape\nbar()\n\n') + fixer_util.touch_import("html", "escape", node) + self.assertEqual(str(node), 'from html import escape\nbar()\n\n') def test_name_import(self): node = parse('bar()') |