Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 82542 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82542 | benjamin.peterson | 2010-07-04 11:44:15 -0500 (Sun, 04 Jul 2010) | 17 lines

  Merged revisions 81478,82530-82531 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

  ........
    r81478 | benjamin.peterson | 2010-05-22 13:47:39 -0500 (Sat, 22 May 2010) | 1 line

    ensure doctests have some future_features
  ........
    r82530 | benjamin.peterson | 2010-07-04 11:11:41 -0500 (Sun, 04 Jul 2010) | 1 line

    simplify ignore star imports from itertools #8892
  ........
    r82531 | benjamin.peterson | 2010-07-04 11:13:20 -0500 (Sun, 04 Jul 2010) | 1 line

    wrap with parenthesis not \
  ........
................
This commit is contained in:
Benjamin Peterson 2010-07-04 16:53:16 +00:00
parent 75b44b3437
commit 9d7003e353
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/lib2to3/fixes/fix_itertools_imports.py
View File

@ -20,6 +20,9 @@ class FixItertoolsImports(fixer_base.BaseFix):
if child.type == token.NAME: if child.type == token.NAME:
member = child.value member = child.value
name_node = child name_node = child
elif child.type == token.STAR:
# Just leave the import as is.
return
else: else:
assert child.type == syms.import_as_name assert child.type == syms.import_as_name
name_node = child.children[0] name_node = child.children[0]
@ -44,8 +47,8 @@ class FixItertoolsImports(fixer_base.BaseFix):
children[-1].remove() children[-1].remove()
# If there are no imports left, just get rid of the entire statement # If there are no imports left, just get rid of the entire statement
if not (imports.children or getattr(imports, 'value', None)) or \ if (not (imports.children or getattr(imports, 'value', None)) or
imports.parent is None: imports.parent is None):
p = node.prefix p = node.prefix
node = BlankLine() node = BlankLine()
node.prefix = p node.prefix = p

4
Lib/lib2to3/tests/test_fixers.py
View File

@ -3670,6 +3670,10 @@ class Test_itertools_imports(FixerTestCase):
a = "from itertools import bar, filterfalse, foo" a = "from itertools import bar, filterfalse, foo"
self.check(b, a) self.check(b, a)
def test_import_star(self):
s = "from itertools import *"
self.unchanged(s)
def test_unchanged(self): def test_unchanged(self):
s = "from itertools import foo" s = "from itertools import foo"