diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-03-22 00:07:09 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-03-22 00:07:09 (GMT) |
| commit | 3faa84f18e2a340c2a805a343f3b10a05dfe5fdd (patch) | |
| tree | d5c29c05c07aeaec9280cf3c6e6b3edaddb8edba /Lib/lib2to3/fixes/fix_future.py | |
| parent | 896c317b43260451b3773d905b8fc90027ea50bf (diff) | |
| download | cpython-3faa84f18e2a340c2a805a343f3b10a05dfe5fdd.zip cpython-3faa84f18e2a340c2a805a343f3b10a05dfe5fdd.tar.gz cpython-3faa84f18e2a340c2a805a343f3b10a05dfe5fdd.tar.bz2 | |
Merged revisions 61724-61725 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r61724 | martin.v.loewis | 2008-03-22 01:01:12 +0100 (Sa, 22 Mär 2008) | 49 lines
Merged revisions 61602-61723 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r61626 | david.wolever | 2008-03-19 17:19:16 +0100 (Mi, 19 Mär 2008) | 1 line
Added fixer for implicit local imports. See #2414.
........
r61628 | david.wolever | 2008-03-19 17:57:43 +0100 (Mi, 19 Mär 2008) | 1 line
Added a class for tests which should not run if a particular import is found.
........
r61629 | collin.winter | 2008-03-19 17:58:19 +0100 (Mi, 19 Mär 2008) | 1 line
Two more relative import fixes in pgen2.
........
r61635 | david.wolever | 2008-03-19 20:16:03 +0100 (Mi, 19 Mär 2008) | 1 line
Fixed print fixer so it will do the Right Thing when it encounters __future__.print_function. 2to3 gets upset, though, so the tests have been commented out.
........
r61637 | david.wolever | 2008-03-19 21:37:17 +0100 (Mi, 19 Mär 2008) | 3 lines
Added a fixer for itertools imports (from itertools import imap, ifilterfalse --> from itertools import filterfalse)
........
r61645 | david.wolever | 2008-03-19 23:22:35 +0100 (Mi, 19 Mär 2008) | 1 line
SVN is happier when you add the files you create... -_-'
........
r61654 | david.wolever | 2008-03-20 01:09:56 +0100 (Do, 20 Mär 2008) | 1 line
Added an explicit sort order to fixers -- fixes problems like #2427
........
r61664 | david.wolever | 2008-03-20 04:32:40 +0100 (Do, 20 Mär 2008) | 3 lines
Fixes #2428 -- comments are no longer eatten by __future__ fixer.
........
r61673 | david.wolever | 2008-03-20 17:22:40 +0100 (Do, 20 Mär 2008) | 1 line
Added 2to3 node pretty-printer
........
r61679 | david.wolever | 2008-03-20 20:50:42 +0100 (Do, 20 Mär 2008) | 1 line
Made node printing a little bit prettier
........
r61723 | martin.v.loewis | 2008-03-22 00:59:27 +0100 (Sa, 22 Mär 2008) | 2 lines
Fix whitespace.
........
................
r61725 | martin.v.loewis | 2008-03-22 01:02:41 +0100 (Sa, 22 Mär 2008) | 2 lines
Install lib2to3.
................
Diffstat (limited to 'Lib/lib2to3/fixes/fix_future.py')
| -rw-r--r-- | Lib/lib2to3/fixes/fix_future.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Lib/lib2to3/fixes/fix_future.py b/Lib/lib2to3/fixes/fix_future.py index f3ba127..62ba6f6 100644 --- a/Lib/lib2to3/fixes/fix_future.py +++ b/Lib/lib2to3/fixes/fix_future.py @@ -11,5 +11,10 @@ from .util import BlankLine class FixFuture(basefix.BaseFix): PATTERN = """import_from< 'from' module_name="__future__" 'import' any >""" + # This should be run last -- some things check for the import + run_order = 10 + def transform(self, node, results): - return BlankLine() + new = BlankLine() + new.prefix = node.get_prefix() + return new |