diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-12-04 02:18:58 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-12-04 02:18:58 (GMT) |
| commit | 848cfa23e149e4bbc85d42fa2ef2979dc9fe9c4c (patch) | |
| tree | 8ff54699b8ca226339393ce892f295f232977cfc /Lib/lib2to3/tests/test_util.py | |
| parent | 4cb64ad8bbeb3c4015d3ed1b55431dc3432f4f18 (diff) | |
| download | cpython-848cfa23e149e4bbc85d42fa2ef2979dc9fe9c4c.zip cpython-848cfa23e149e4bbc85d42fa2ef2979dc9fe9c4c.tar.gz cpython-848cfa23e149e4bbc85d42fa2ef2979dc9fe9c4c.tar.bz2 | |
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 16:57:29 -0500 (Fri, 15 Oct 2010) | 1 line
escape() is now in the html module
........
r86156 | georg.brandl | 2010-11-04 03:34:57 -0500 (Thu, 04 Nov 2010) | 1 line
Consistency fixes in option parser help texts.
........
r86157 | georg.brandl | 2010-11-04 03:35:30 -0500 (Thu, 04 Nov 2010) | 1 line
#10286: fix urllib class names.
........
r86464 | benjamin.peterson | 2010-11-14 09:28:52 -0600 (Sun, 14 Nov 2010) | 1 line
match only .py files #10416
........
Diffstat (limited to 'Lib/lib2to3/tests/test_util.py')
| -rw-r--r-- | Lib/lib2to3/tests/test_util.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/lib2to3/tests/test_util.py b/Lib/lib2to3/tests/test_util.py index 9365edc..2fab8b9 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()') |