diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-01-09 02:13:34 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-01-09 02:13:34 (GMT) |
| commit | 25f221b0cbc9608ff54d740691cdcd2e87d2102d (patch) | |
| tree | 6fb8c23771a844c698228a90edeca0a93b798a38 /Lib/lib2to3/fixes/fix_imports2.py | |
| parent | 1a240fb9f038839f0e6f157ce4c7fcbcbf777ebc (diff) | |
| download | cpython-25f221b0cbc9608ff54d740691cdcd2e87d2102d.zip cpython-25f221b0cbc9608ff54d740691cdcd2e87d2102d.tar.gz cpython-25f221b0cbc9608ff54d740691cdcd2e87d2102d.tar.bz2 | |
Merged revisions 68306-68308,68340,68368,68422 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r68306 | benjamin.peterson | 2009-01-04 12:27:19 -0600 (Sun, 04 Jan 2009) | 1 line
fix_urllib: add mappings for the url parsing functions
........
r68307 | benjamin.peterson | 2009-01-04 12:30:01 -0600 (Sun, 04 Jan 2009) | 1 line
remove duplicated function
........
r68308 | benjamin.peterson | 2009-01-04 12:50:34 -0600 (Sun, 04 Jan 2009) | 1 line
turtle is no longer renamed
........
r68340 | georg.brandl | 2009-01-05 02:11:39 -0600 (Mon, 05 Jan 2009) | 2 lines
Fix undefined locals in parse_tokens().
........
r68368 | benjamin.peterson | 2009-01-06 17:56:10 -0600 (Tue, 06 Jan 2009) | 1 line
fix typo (thanks to Robert Lehmann)
........
r68422 | benjamin.peterson | 2009-01-08 20:01:03 -0600 (Thu, 08 Jan 2009) | 1 line
run the imports fixers after fix_import, so fix_import doesn't try to make stdlib renames into relative imports #4876
........
Diffstat (limited to 'Lib/lib2to3/fixes/fix_imports2.py')
| -rw-r--r-- | Lib/lib2to3/fixes/fix_imports2.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/lib2to3/fixes/fix_imports2.py b/Lib/lib2to3/fixes/fix_imports2.py index 477bafd..9a33c67 100644 --- a/Lib/lib2to3/fixes/fix_imports2.py +++ b/Lib/lib2to3/fixes/fix_imports2.py @@ -11,6 +11,6 @@ MAPPING = { class FixImports2(fix_imports.FixImports): - run_order = 6 + run_order = 7 mapping = MAPPING |