diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-03-24 00:50:58 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-03-24 00:50:58 (GMT) |
| commit | a675ef1141e2533bd5596222d0a64b6a3f74d2d0 (patch) | |
| tree | 3f26e263209e15f5c885538eed005e9aaa736351 /Lib/lib2to3/fixes/fix_itertools_imports.py | |
| parent | fe337bfd0d89c62917e3625111c65f4aa187c6b4 (diff) | |
| download | cpython-a675ef1141e2533bd5596222d0a64b6a3f74d2d0.zip cpython-a675ef1141e2533bd5596222d0a64b6a3f74d2d0.tar.gz cpython-a675ef1141e2533bd5596222d0a64b6a3f74d2d0.tar.bz2 | |
Merged revisions 61825 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r61825 | martin.v.loewis | 2008-03-24 01:46:53 +0100 (Mo, 24 Mär 2008) | 17 lines
Merged revisions 61724-61824 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r61730 | martin.v.loewis | 2008-03-22 02:20:58 +0100 (Sa, 22 Mär 2008) | 2 lines
More explicit relative imports.
........
r61755 | david.wolever | 2008-03-22 21:33:52 +0100 (Sa, 22 Mär 2008) | 1 line
Fixing #2446 -- 2to3 now translates 'import foo' to 'from . import foo'
........
r61824 | david.wolever | 2008-03-24 01:30:24 +0100 (Mo, 24 Mär 2008) | 3 lines
Fixed a bug where 'from itertools import izip' would return 'from itertools import'
........
................
Diffstat (limited to 'Lib/lib2to3/fixes/fix_itertools_imports.py')
| -rw-r--r-- | Lib/lib2to3/fixes/fix_itertools_imports.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Lib/lib2to3/fixes/fix_itertools_imports.py b/Lib/lib2to3/fixes/fix_itertools_imports.py index 7adf643..e60ec20 100644 --- a/Lib/lib2to3/fixes/fix_itertools_imports.py +++ b/Lib/lib2to3/fixes/fix_itertools_imports.py @@ -17,6 +17,9 @@ class FixItertoolsImports(basefix.BaseFix): # Handle 'import ... as ...' continue if child.value in ('imap', 'izip', 'ifilter'): + # The value must be set to none in case child == import, + # so that the test for empty imports will work out + child.value = None child.remove() elif child.value == 'ifilterfalse': node.changed() @@ -34,10 +37,9 @@ class FixItertoolsImports(basefix.BaseFix): if str(children[-1]) == ',': children[-1].remove() - # If there is nothing left, return a blank line + # If there are no imports left, just get rid of the entire statement if not (imports.children or getattr(imports, 'value', None)): - new = BlankLine() - new.prefix = node.get_prefix() - else: - new = node - return new + p = node.get_prefix() + node = BlankLine() + node.prefix = p + return node |