diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-03-22 00:01:12 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-03-22 00:01:12 (GMT) |
| commit | baf267ceaeb7d4d1e15228018c450a9f738fcf3e (patch) | |
| tree | 91f0dab0d15d23dcc519f6c541f221739d7ee8cd /Lib/lib2to3/fixes/fix_print.py | |
| parent | 0e9ab5f2f0f907b57c70557e21633ce8c341d1d1 (diff) | |
| download | cpython-baf267ceaeb7d4d1e15228018c450a9f738fcf3e.zip cpython-baf267ceaeb7d4d1e15228018c450a9f738fcf3e.tar.gz cpython-baf267ceaeb7d4d1e15228018c450a9f738fcf3e.tar.bz2 | |
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.
........
Diffstat (limited to 'Lib/lib2to3/fixes/fix_print.py')
| -rw-r--r-- | Lib/lib2to3/fixes/fix_print.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Lib/lib2to3/fixes/fix_print.py b/Lib/lib2to3/fixes/fix_print.py index ddd846a..ae91a8d 100644 --- a/Lib/lib2to3/fixes/fix_print.py +++ b/Lib/lib2to3/fixes/fix_print.py @@ -8,6 +8,9 @@ Change: 'print ...' into 'print(...)' 'print ... ,' into 'print(..., end=" ")' 'print >>x, ...' into 'print(..., file=x)' + +No changes are applied if print_function is imported from __future__ + """ # Local imports @@ -23,14 +26,20 @@ parend_expr = patcomp.compile_pattern( ) -class FixPrint(basefix.BaseFix): +class FixPrint(basefix.ConditionalFix): PATTERN = """ simple_stmt< bare='print' any > | print_stmt """ + skip_on = '__future__.print_function' + def transform(self, node, results): assert results + + if self.should_skip(node): + return + bare_print = results.get("bare") if bare_print: |