2008-03-19 01:43:46 -03:00
|
|
|
"""Utility functions, node construction macros, etc."""
|
|
|
|
# Author: Collin Winter
|
|
|
|
|
|
|
|
# Local imports
|
Merged revisions 63661,63666,63695,63711,63729,63769,63790,63880,63886 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r63661 | georg.brandl | 2008-05-26 05:26:20 -0500 (Mon, 26 May 2008) | 2 lines
Add import fixes for dbm package.
........
r63666 | georg.brandl | 2008-05-26 05:49:09 -0500 (Mon, 26 May 2008) | 2 lines
Add xmlrpc package fixes.
........
r63695 | georg.brandl | 2008-05-26 10:14:33 -0500 (Mon, 26 May 2008) | 2 lines
Add fixer entries for http package.
........
r63711 | benjamin.peterson | 2008-05-26 13:43:51 -0500 (Mon, 26 May 2008) | 2 lines
add import mapping for test.test_support -> test.support
........
r63729 | benjamin.peterson | 2008-05-26 16:31:03 -0500 (Mon, 26 May 2008) | 2 lines
mapping for commands module -> subprocess
........
r63769 | brett.cannon | 2008-05-29 00:13:13 -0500 (Thu, 29 May 2008) | 1 line
Fixer for UserString.UserString over to the collections module.
........
r63790 | brett.cannon | 2008-05-29 14:13:51 -0500 (Thu, 29 May 2008) | 4 lines
Add a fixer for UserList.
Closes issue #2878. Thanks to Quentin Gallet-Gilles for the patch.
........
r63880 | collin.winter | 2008-06-01 18:09:38 -0500 (Sun, 01 Jun 2008) | 6 lines
Move lib2to3/fixes/{basefix,util}.py down to lib2to3/.
This is step 1 of turning lib2to3/ into a general-purpose refactoring
library, reusable by other projects.
........
r63886 | collin.winter | 2008-06-01 22:15:01 -0500 (Sun, 01 Jun 2008) | 5 lines
Allow refactoring tools to specify a directory for fixer modules.
This is step 2 of turning lib2to3/ into a general-purpose refactoring
library, reusable by other projects. Step 1: r63880.
........
2008-06-14 23:31:05 -03:00
|
|
|
from .pgen2 import token
|
|
|
|
from .pytree import Leaf, Node
|
|
|
|
from .pygram import python_symbols as syms
|
|
|
|
from . import patcomp
|
2008-03-19 01:43:46 -03:00
|
|
|
|
|
|
|
|
|
|
|
###########################################################
|
|
|
|
### Common node-construction "macros"
|
|
|
|
###########################################################
|
|
|
|
|
|
|
|
def KeywordArg(keyword, value):
|
|
|
|
return Node(syms.argument,
|
|
|
|
[keyword, Leaf(token.EQUAL, '='), value])
|
|
|
|
|
|
|
|
def LParen():
|
|
|
|
return Leaf(token.LPAR, "(")
|
|
|
|
|
|
|
|
def RParen():
|
|
|
|
return Leaf(token.RPAR, ")")
|
|
|
|
|
|
|
|
def Assign(target, source):
|
|
|
|
"""Build an assignment statement"""
|
|
|
|
if not isinstance(target, list):
|
|
|
|
target = [target]
|
|
|
|
if not isinstance(source, list):
|
|
|
|
source.set_prefix(" ")
|
|
|
|
source = [source]
|
|
|
|
|
|
|
|
return Node(syms.atom,
|
|
|
|
target + [Leaf(token.EQUAL, "=", prefix=" ")] + source)
|
|
|
|
|
|
|
|
def Name(name, prefix=None):
|
|
|
|
"""Return a NAME leaf"""
|
|
|
|
return Leaf(token.NAME, name, prefix=prefix)
|
|
|
|
|
|
|
|
def Attr(obj, attr):
|
|
|
|
"""A node tuple for obj.attr"""
|
|
|
|
return [obj, Node(syms.trailer, [Dot(), attr])]
|
|
|
|
|
|
|
|
def Comma():
|
|
|
|
"""A comma leaf"""
|
|
|
|
return Leaf(token.COMMA, ",")
|
|
|
|
|
|
|
|
def Dot():
|
|
|
|
"""A period (.) leaf"""
|
|
|
|
return Leaf(token.DOT, ".")
|
|
|
|
|
|
|
|
def ArgList(args, lparen=LParen(), rparen=RParen()):
|
|
|
|
"""A parenthesised argument list, used by Call()"""
|
2008-09-01 14:17:22 -03:00
|
|
|
node = Node(syms.trailer, [lparen.clone(), rparen.clone()])
|
|
|
|
if args:
|
|
|
|
node.insert_child(1, Node(syms.arglist, args))
|
|
|
|
return node
|
2008-03-19 01:43:46 -03:00
|
|
|
|
2008-09-01 14:17:22 -03:00
|
|
|
def Call(func_name, args=None, prefix=None):
|
2008-03-19 01:43:46 -03:00
|
|
|
"""A function call"""
|
|
|
|
node = Node(syms.power, [func_name, ArgList(args)])
|
|
|
|
if prefix is not None:
|
|
|
|
node.set_prefix(prefix)
|
|
|
|
return node
|
|
|
|
|
|
|
|
def Newline():
|
|
|
|
"""A newline literal"""
|
|
|
|
return Leaf(token.NEWLINE, "\n")
|
|
|
|
|
|
|
|
def BlankLine():
|
|
|
|
"""A blank line"""
|
|
|
|
return Leaf(token.NEWLINE, "")
|
|
|
|
|
|
|
|
def Number(n, prefix=None):
|
|
|
|
return Leaf(token.NUMBER, n, prefix=prefix)
|
|
|
|
|
|
|
|
def Subscript(index_node):
|
|
|
|
"""A numeric or string subscript"""
|
|
|
|
return Node(syms.trailer, [Leaf(token.LBRACE, '['),
|
|
|
|
index_node,
|
|
|
|
Leaf(token.RBRACE, ']')])
|
|
|
|
|
|
|
|
def String(string, prefix=None):
|
|
|
|
"""A string leaf"""
|
|
|
|
return Leaf(token.STRING, string, prefix=prefix)
|
|
|
|
|
|
|
|
def ListComp(xp, fp, it, test=None):
|
|
|
|
"""A list comprehension of the form [xp for fp in it if test].
|
|
|
|
|
|
|
|
If test is None, the "if test" part is omitted.
|
|
|
|
"""
|
|
|
|
xp.set_prefix("")
|
|
|
|
fp.set_prefix(" ")
|
|
|
|
it.set_prefix(" ")
|
|
|
|
for_leaf = Leaf(token.NAME, "for")
|
|
|
|
for_leaf.set_prefix(" ")
|
|
|
|
in_leaf = Leaf(token.NAME, "in")
|
|
|
|
in_leaf.set_prefix(" ")
|
|
|
|
inner_args = [for_leaf, fp, in_leaf, it]
|
|
|
|
if test:
|
|
|
|
test.set_prefix(" ")
|
|
|
|
if_leaf = Leaf(token.NAME, "if")
|
|
|
|
if_leaf.set_prefix(" ")
|
|
|
|
inner_args.append(Node(syms.comp_if, [if_leaf, test]))
|
|
|
|
inner = Node(syms.listmaker, [xp, Node(syms.comp_for, inner_args)])
|
|
|
|
return Node(syms.atom,
|
|
|
|
[Leaf(token.LBRACE, "["),
|
|
|
|
inner,
|
|
|
|
Leaf(token.RBRACE, "]")])
|
|
|
|
|
2008-03-23 21:46:53 -03:00
|
|
|
def FromImport(package_name, name_leafs):
|
|
|
|
""" Return an import statement in the form:
|
|
|
|
from package import name_leafs"""
|
|
|
|
# XXX: May not handle dotted imports properly (eg, package_name='foo.bar')
|
Merged revisions 64863,64868,64870,64942,65001-65002,65017-65018 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r64863 | brett.cannon | 2008-07-10 19:42:32 -0500 (Thu, 10 Jul 2008) | 1 line
Add urlparse -> urllib.parse to fix_imports.
........
r64868 | brett.cannon | 2008-07-10 20:00:10 -0500 (Thu, 10 Jul 2008) | 1 line
Add robotparser -> urllib.robotparser to fix_imports.
........
r64870 | brett.cannon | 2008-07-11 00:56:27 -0500 (Fri, 11 Jul 2008) | 6 lines
Fix the fixers for the new dbm package.
Had to create a new fixer (fix_imports2) which did fixes in post-order. This
because ``import anydbm`` was being translated into ``import dbm`` which was
then subsequently changed into ``import dbm.ndbm``; one transform too many.
........
r64942 | collin.winter | 2008-07-13 20:19:05 -0500 (Sun, 13 Jul 2008) | 1 line
Add a comment explaining part of fix_imports.py
........
r65001 | brett.cannon | 2008-07-16 00:11:12 -0500 (Wed, 16 Jul 2008) | 2 lines
Remove some extraneous whitespace.
........
r65002 | brett.cannon | 2008-07-16 00:12:04 -0500 (Wed, 16 Jul 2008) | 4 lines
Implement a fixer for urllib(2).
Thanks Nick Edds for the patch.
........
r65017 | benjamin.peterson | 2008-07-16 11:04:19 -0500 (Wed, 16 Jul 2008) | 1 line
fix 2to3 in Python 2.6
........
r65018 | benjamin.peterson | 2008-07-16 11:55:21 -0500 (Wed, 16 Jul 2008) | 1 line
normalize whitespace
........
2008-07-16 14:01:46 -03:00
|
|
|
#assert package_name == '.' or '.' not in package_name, "FromImport has "\
|
|
|
|
# "not been tested with dotted package names -- use at your own "\
|
|
|
|
# "peril!"
|
2008-03-23 21:46:53 -03:00
|
|
|
|
|
|
|
for leaf in name_leafs:
|
|
|
|
# Pull the leaves out of their old tree
|
|
|
|
leaf.remove()
|
|
|
|
|
|
|
|
children = [Leaf(token.NAME, 'from'),
|
|
|
|
Leaf(token.NAME, package_name, prefix=" "),
|
|
|
|
Leaf(token.NAME, 'import', prefix=" "),
|
|
|
|
Node(syms.import_as_names, name_leafs)]
|
|
|
|
imp = Node(syms.import_from, children)
|
|
|
|
return imp
|
|
|
|
|
|
|
|
|
2008-03-19 01:43:46 -03:00
|
|
|
###########################################################
|
|
|
|
### Determine whether a node represents a given literal
|
|
|
|
###########################################################
|
|
|
|
|
|
|
|
def is_tuple(node):
|
|
|
|
"""Does the node represent a tuple literal?"""
|
|
|
|
if isinstance(node, Node) and node.children == [LParen(), RParen()]:
|
|
|
|
return True
|
|
|
|
return (isinstance(node, Node)
|
|
|
|
and len(node.children) == 3
|
|
|
|
and isinstance(node.children[0], Leaf)
|
|
|
|
and isinstance(node.children[1], Node)
|
|
|
|
and isinstance(node.children[2], Leaf)
|
|
|
|
and node.children[0].value == "("
|
|
|
|
and node.children[2].value == ")")
|
|
|
|
|
|
|
|
def is_list(node):
|
|
|
|
"""Does the node represent a list literal?"""
|
|
|
|
return (isinstance(node, Node)
|
|
|
|
and len(node.children) > 1
|
|
|
|
and isinstance(node.children[0], Leaf)
|
|
|
|
and isinstance(node.children[-1], Leaf)
|
|
|
|
and node.children[0].value == "["
|
|
|
|
and node.children[-1].value == "]")
|
|
|
|
|
|
|
|
|
|
|
|
###########################################################
|
|
|
|
### Misc
|
|
|
|
###########################################################
|
|
|
|
|
Merged revisions 67427,67431,67433,67435,67630,67652,67656-67657,67674-67675,67678-67679,67705-67706,67716,67723,67765-67771,67774,67776,67778 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r67427 | benjamin.peterson | 2008-11-28 16:07:41 -0600 (Fri, 28 Nov 2008) | 1 line
fix spelling in comment
........
r67431 | benjamin.peterson | 2008-11-28 17:14:08 -0600 (Fri, 28 Nov 2008) | 1 line
add a scripts directory; move things to it
........
r67433 | benjamin.peterson | 2008-11-28 17:18:48 -0600 (Fri, 28 Nov 2008) | 1 line
run svneol.py
........
r67435 | benjamin.peterson | 2008-11-28 17:25:03 -0600 (Fri, 28 Nov 2008) | 1 line
rename pre/post_order_mapping to pre/post_order_heads
........
r67630 | alexandre.vassalotti | 2008-12-06 21:51:56 -0600 (Sat, 06 Dec 2008) | 2 lines
Fix typo in the urllib2.HTTPDigestAuthHandler fixer.
........
r67652 | armin.ronacher | 2008-12-07 15:39:43 -0600 (Sun, 07 Dec 2008) | 5 lines
Added a fixer that cleans up a tuple argument to isinstance after the tokens
in it were fixed. This is mainly used to remove double occurrences of
tokens as a leftover of the long -> int / unicode -> str conversion.
........
r67656 | armin.ronacher | 2008-12-07 16:54:16 -0600 (Sun, 07 Dec 2008) | 3 lines
Added missing copyright fo 2to3 fix_isinstance.
........
r67657 | armin.ronacher | 2008-12-07 18:29:35 -0600 (Sun, 07 Dec 2008) | 3 lines
2to3: intern and reduce fixes now add the imports if missing. Because that is a common task the fixer_util module now has a function "touch_import" that adds imports if missing.
........
r67674 | benjamin.peterson | 2008-12-08 19:58:11 -0600 (Mon, 08 Dec 2008) | 1 line
copy permission bits when making backup files #4602
........
r67675 | benjamin.peterson | 2008-12-08 19:59:11 -0600 (Mon, 08 Dec 2008) | 1 line
add forgotten import
........
r67678 | benjamin.peterson | 2008-12-08 20:08:30 -0600 (Mon, 08 Dec 2008) | 1 line
fix #4602 for real
........
r67679 | armin.ronacher | 2008-12-09 00:54:03 -0600 (Tue, 09 Dec 2008) | 3 lines
Removed redudant code from the 2to3 long fixer. This fixes #4590.
........
r67705 | benjamin.peterson | 2008-12-11 13:04:08 -0600 (Thu, 11 Dec 2008) | 1 line
put trailers after a range call after the list()
........
r67706 | benjamin.peterson | 2008-12-11 13:17:57 -0600 (Thu, 11 Dec 2008) | 1 line
add html related modules to the fix_imports mapping
........
r67716 | benjamin.peterson | 2008-12-11 22:16:47 -0600 (Thu, 11 Dec 2008) | 1 line
consolidate tests
........
r67723 | benjamin.peterson | 2008-12-12 19:49:31 -0600 (Fri, 12 Dec 2008) | 1 line
fix name
........
r67765 | benjamin.peterson | 2008-12-14 14:05:05 -0600 (Sun, 14 Dec 2008) | 1 line
run fix_isinstance after fix_long and fix_unicode
........
r67766 | benjamin.peterson | 2008-12-14 14:13:05 -0600 (Sun, 14 Dec 2008) | 1 line
use run_order instead of order
........
r67767 | benjamin.peterson | 2008-12-14 14:28:12 -0600 (Sun, 14 Dec 2008) | 1 line
don't retain parenthesis if there is only one item left
........
r67768 | benjamin.peterson | 2008-12-14 14:32:30 -0600 (Sun, 14 Dec 2008) | 1 line
use insert_child()
........
r67769 | benjamin.peterson | 2008-12-14 14:59:10 -0600 (Sun, 14 Dec 2008) | 1 line
parenthesize doesn't belong in pygram or FixerBase
........
r67770 | alexandre.vassalotti | 2008-12-14 15:15:36 -0600 (Sun, 14 Dec 2008) | 2 lines
Fix typo: html.paser -> html.parser.
........
r67771 | benjamin.peterson | 2008-12-14 15:22:09 -0600 (Sun, 14 Dec 2008) | 1 line
altering .children needs to call changed()
........
r67774 | benjamin.peterson | 2008-12-14 15:55:38 -0600 (Sun, 14 Dec 2008) | 1 line
employ an evil hack to fix multiple names in the same import statement
........
r67776 | benjamin.peterson | 2008-12-14 16:22:38 -0600 (Sun, 14 Dec 2008) | 1 line
make a common mixin class for Test_imports and friends
........
r67778 | alexandre.vassalotti | 2008-12-14 17:48:20 -0600 (Sun, 14 Dec 2008) | 2 lines
Make fix_imports refactor multiple imports as.
........
2008-12-15 23:35:28 -04:00
|
|
|
def parenthesize(node):
|
|
|
|
return Node(syms.atom, [LParen(), node, RParen()])
|
|
|
|
|
2008-04-09 23:48:01 -03:00
|
|
|
|
|
|
|
consuming_calls = set(["sorted", "list", "set", "any", "all", "tuple", "sum",
|
|
|
|
"min", "max"])
|
|
|
|
|
2008-03-19 01:43:46 -03:00
|
|
|
def attr_chain(obj, attr):
|
|
|
|
"""Follow an attribute chain.
|
2008-03-19 02:22:42 -03:00
|
|
|
|
2008-03-19 01:43:46 -03:00
|
|
|
If you have a chain of objects where a.foo -> b, b.foo-> c, etc,
|
|
|
|
use this to iterate over all objects in the chain. Iteration is
|
|
|
|
terminated by getattr(x, attr) is None.
|
2008-03-19 02:22:42 -03:00
|
|
|
|
2008-03-19 01:43:46 -03:00
|
|
|
Args:
|
|
|
|
obj: the starting object
|
|
|
|
attr: the name of the chaining attribute
|
2008-03-19 02:22:42 -03:00
|
|
|
|
2008-03-19 01:43:46 -03:00
|
|
|
Yields:
|
|
|
|
Each successive object in the chain.
|
|
|
|
"""
|
|
|
|
next = getattr(obj, attr)
|
|
|
|
while next:
|
|
|
|
yield next
|
|
|
|
next = getattr(next, attr)
|
|
|
|
|
2008-03-19 02:22:42 -03:00
|
|
|
p0 = """for_stmt< 'for' any 'in' node=any ':' any* >
|
|
|
|
| comp_for< 'for' any 'in' node=any any* >
|
|
|
|
"""
|
|
|
|
p1 = """
|
|
|
|
power<
|
|
|
|
( 'iter' | 'list' | 'tuple' | 'sorted' | 'set' | 'sum' |
|
|
|
|
'any' | 'all' | (any* trailer< '.' 'join' >) )
|
|
|
|
trailer< '(' node=any ')' >
|
|
|
|
any*
|
|
|
|
>
|
|
|
|
"""
|
|
|
|
p2 = """
|
|
|
|
power<
|
|
|
|
'sorted'
|
|
|
|
trailer< '(' arglist<node=any any*> ')' >
|
|
|
|
any*
|
|
|
|
>
|
|
|
|
"""
|
|
|
|
pats_built = False
|
|
|
|
def in_special_context(node):
|
|
|
|
""" Returns true if node is in an environment where all that is required
|
|
|
|
of it is being itterable (ie, it doesn't matter if it returns a list
|
|
|
|
or an itterator).
|
|
|
|
See test_map_nochange in test_fixers.py for some examples and tests.
|
|
|
|
"""
|
|
|
|
global p0, p1, p2, pats_built
|
|
|
|
if not pats_built:
|
|
|
|
p1 = patcomp.compile_pattern(p1)
|
|
|
|
p0 = patcomp.compile_pattern(p0)
|
|
|
|
p2 = patcomp.compile_pattern(p2)
|
|
|
|
pats_built = True
|
|
|
|
patterns = [p0, p1, p2]
|
|
|
|
for pattern, parent in zip(patterns, attr_chain(node, "parent")):
|
|
|
|
results = {}
|
|
|
|
if pattern.match(parent, results) and results["node"] is node:
|
|
|
|
return True
|
|
|
|
return False
|
|
|
|
|
2008-03-19 01:43:46 -03:00
|
|
|
###########################################################
|
|
|
|
### The following functions are to find bindings in a suite
|
|
|
|
###########################################################
|
|
|
|
|
|
|
|
def make_suite(node):
|
|
|
|
if node.type == syms.suite:
|
|
|
|
return node
|
|
|
|
node = node.clone()
|
|
|
|
parent, node.parent = node.parent, None
|
|
|
|
suite = Node(syms.suite, [node])
|
|
|
|
suite.parent = parent
|
|
|
|
return suite
|
|
|
|
|
Merged revisions 67427,67431,67433,67435,67630,67652,67656-67657,67674-67675,67678-67679,67705-67706,67716,67723,67765-67771,67774,67776,67778 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r67427 | benjamin.peterson | 2008-11-28 16:07:41 -0600 (Fri, 28 Nov 2008) | 1 line
fix spelling in comment
........
r67431 | benjamin.peterson | 2008-11-28 17:14:08 -0600 (Fri, 28 Nov 2008) | 1 line
add a scripts directory; move things to it
........
r67433 | benjamin.peterson | 2008-11-28 17:18:48 -0600 (Fri, 28 Nov 2008) | 1 line
run svneol.py
........
r67435 | benjamin.peterson | 2008-11-28 17:25:03 -0600 (Fri, 28 Nov 2008) | 1 line
rename pre/post_order_mapping to pre/post_order_heads
........
r67630 | alexandre.vassalotti | 2008-12-06 21:51:56 -0600 (Sat, 06 Dec 2008) | 2 lines
Fix typo in the urllib2.HTTPDigestAuthHandler fixer.
........
r67652 | armin.ronacher | 2008-12-07 15:39:43 -0600 (Sun, 07 Dec 2008) | 5 lines
Added a fixer that cleans up a tuple argument to isinstance after the tokens
in it were fixed. This is mainly used to remove double occurrences of
tokens as a leftover of the long -> int / unicode -> str conversion.
........
r67656 | armin.ronacher | 2008-12-07 16:54:16 -0600 (Sun, 07 Dec 2008) | 3 lines
Added missing copyright fo 2to3 fix_isinstance.
........
r67657 | armin.ronacher | 2008-12-07 18:29:35 -0600 (Sun, 07 Dec 2008) | 3 lines
2to3: intern and reduce fixes now add the imports if missing. Because that is a common task the fixer_util module now has a function "touch_import" that adds imports if missing.
........
r67674 | benjamin.peterson | 2008-12-08 19:58:11 -0600 (Mon, 08 Dec 2008) | 1 line
copy permission bits when making backup files #4602
........
r67675 | benjamin.peterson | 2008-12-08 19:59:11 -0600 (Mon, 08 Dec 2008) | 1 line
add forgotten import
........
r67678 | benjamin.peterson | 2008-12-08 20:08:30 -0600 (Mon, 08 Dec 2008) | 1 line
fix #4602 for real
........
r67679 | armin.ronacher | 2008-12-09 00:54:03 -0600 (Tue, 09 Dec 2008) | 3 lines
Removed redudant code from the 2to3 long fixer. This fixes #4590.
........
r67705 | benjamin.peterson | 2008-12-11 13:04:08 -0600 (Thu, 11 Dec 2008) | 1 line
put trailers after a range call after the list()
........
r67706 | benjamin.peterson | 2008-12-11 13:17:57 -0600 (Thu, 11 Dec 2008) | 1 line
add html related modules to the fix_imports mapping
........
r67716 | benjamin.peterson | 2008-12-11 22:16:47 -0600 (Thu, 11 Dec 2008) | 1 line
consolidate tests
........
r67723 | benjamin.peterson | 2008-12-12 19:49:31 -0600 (Fri, 12 Dec 2008) | 1 line
fix name
........
r67765 | benjamin.peterson | 2008-12-14 14:05:05 -0600 (Sun, 14 Dec 2008) | 1 line
run fix_isinstance after fix_long and fix_unicode
........
r67766 | benjamin.peterson | 2008-12-14 14:13:05 -0600 (Sun, 14 Dec 2008) | 1 line
use run_order instead of order
........
r67767 | benjamin.peterson | 2008-12-14 14:28:12 -0600 (Sun, 14 Dec 2008) | 1 line
don't retain parenthesis if there is only one item left
........
r67768 | benjamin.peterson | 2008-12-14 14:32:30 -0600 (Sun, 14 Dec 2008) | 1 line
use insert_child()
........
r67769 | benjamin.peterson | 2008-12-14 14:59:10 -0600 (Sun, 14 Dec 2008) | 1 line
parenthesize doesn't belong in pygram or FixerBase
........
r67770 | alexandre.vassalotti | 2008-12-14 15:15:36 -0600 (Sun, 14 Dec 2008) | 2 lines
Fix typo: html.paser -> html.parser.
........
r67771 | benjamin.peterson | 2008-12-14 15:22:09 -0600 (Sun, 14 Dec 2008) | 1 line
altering .children needs to call changed()
........
r67774 | benjamin.peterson | 2008-12-14 15:55:38 -0600 (Sun, 14 Dec 2008) | 1 line
employ an evil hack to fix multiple names in the same import statement
........
r67776 | benjamin.peterson | 2008-12-14 16:22:38 -0600 (Sun, 14 Dec 2008) | 1 line
make a common mixin class for Test_imports and friends
........
r67778 | alexandre.vassalotti | 2008-12-14 17:48:20 -0600 (Sun, 14 Dec 2008) | 2 lines
Make fix_imports refactor multiple imports as.
........
2008-12-15 23:35:28 -04:00
|
|
|
def find_root(node):
|
|
|
|
"""Find the top level namespace."""
|
2008-03-19 01:43:46 -03:00
|
|
|
# Scamper up to the top level namespace
|
|
|
|
while node.type != syms.file_input:
|
|
|
|
assert node.parent, "Tree is insane! root found before "\
|
|
|
|
"file_input node was found."
|
|
|
|
node = node.parent
|
Merged revisions 67427,67431,67433,67435,67630,67652,67656-67657,67674-67675,67678-67679,67705-67706,67716,67723,67765-67771,67774,67776,67778 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r67427 | benjamin.peterson | 2008-11-28 16:07:41 -0600 (Fri, 28 Nov 2008) | 1 line
fix spelling in comment
........
r67431 | benjamin.peterson | 2008-11-28 17:14:08 -0600 (Fri, 28 Nov 2008) | 1 line
add a scripts directory; move things to it
........
r67433 | benjamin.peterson | 2008-11-28 17:18:48 -0600 (Fri, 28 Nov 2008) | 1 line
run svneol.py
........
r67435 | benjamin.peterson | 2008-11-28 17:25:03 -0600 (Fri, 28 Nov 2008) | 1 line
rename pre/post_order_mapping to pre/post_order_heads
........
r67630 | alexandre.vassalotti | 2008-12-06 21:51:56 -0600 (Sat, 06 Dec 2008) | 2 lines
Fix typo in the urllib2.HTTPDigestAuthHandler fixer.
........
r67652 | armin.ronacher | 2008-12-07 15:39:43 -0600 (Sun, 07 Dec 2008) | 5 lines
Added a fixer that cleans up a tuple argument to isinstance after the tokens
in it were fixed. This is mainly used to remove double occurrences of
tokens as a leftover of the long -> int / unicode -> str conversion.
........
r67656 | armin.ronacher | 2008-12-07 16:54:16 -0600 (Sun, 07 Dec 2008) | 3 lines
Added missing copyright fo 2to3 fix_isinstance.
........
r67657 | armin.ronacher | 2008-12-07 18:29:35 -0600 (Sun, 07 Dec 2008) | 3 lines
2to3: intern and reduce fixes now add the imports if missing. Because that is a common task the fixer_util module now has a function "touch_import" that adds imports if missing.
........
r67674 | benjamin.peterson | 2008-12-08 19:58:11 -0600 (Mon, 08 Dec 2008) | 1 line
copy permission bits when making backup files #4602
........
r67675 | benjamin.peterson | 2008-12-08 19:59:11 -0600 (Mon, 08 Dec 2008) | 1 line
add forgotten import
........
r67678 | benjamin.peterson | 2008-12-08 20:08:30 -0600 (Mon, 08 Dec 2008) | 1 line
fix #4602 for real
........
r67679 | armin.ronacher | 2008-12-09 00:54:03 -0600 (Tue, 09 Dec 2008) | 3 lines
Removed redudant code from the 2to3 long fixer. This fixes #4590.
........
r67705 | benjamin.peterson | 2008-12-11 13:04:08 -0600 (Thu, 11 Dec 2008) | 1 line
put trailers after a range call after the list()
........
r67706 | benjamin.peterson | 2008-12-11 13:17:57 -0600 (Thu, 11 Dec 2008) | 1 line
add html related modules to the fix_imports mapping
........
r67716 | benjamin.peterson | 2008-12-11 22:16:47 -0600 (Thu, 11 Dec 2008) | 1 line
consolidate tests
........
r67723 | benjamin.peterson | 2008-12-12 19:49:31 -0600 (Fri, 12 Dec 2008) | 1 line
fix name
........
r67765 | benjamin.peterson | 2008-12-14 14:05:05 -0600 (Sun, 14 Dec 2008) | 1 line
run fix_isinstance after fix_long and fix_unicode
........
r67766 | benjamin.peterson | 2008-12-14 14:13:05 -0600 (Sun, 14 Dec 2008) | 1 line
use run_order instead of order
........
r67767 | benjamin.peterson | 2008-12-14 14:28:12 -0600 (Sun, 14 Dec 2008) | 1 line
don't retain parenthesis if there is only one item left
........
r67768 | benjamin.peterson | 2008-12-14 14:32:30 -0600 (Sun, 14 Dec 2008) | 1 line
use insert_child()
........
r67769 | benjamin.peterson | 2008-12-14 14:59:10 -0600 (Sun, 14 Dec 2008) | 1 line
parenthesize doesn't belong in pygram or FixerBase
........
r67770 | alexandre.vassalotti | 2008-12-14 15:15:36 -0600 (Sun, 14 Dec 2008) | 2 lines
Fix typo: html.paser -> html.parser.
........
r67771 | benjamin.peterson | 2008-12-14 15:22:09 -0600 (Sun, 14 Dec 2008) | 1 line
altering .children needs to call changed()
........
r67774 | benjamin.peterson | 2008-12-14 15:55:38 -0600 (Sun, 14 Dec 2008) | 1 line
employ an evil hack to fix multiple names in the same import statement
........
r67776 | benjamin.peterson | 2008-12-14 16:22:38 -0600 (Sun, 14 Dec 2008) | 1 line
make a common mixin class for Test_imports and friends
........
r67778 | alexandre.vassalotti | 2008-12-14 17:48:20 -0600 (Sun, 14 Dec 2008) | 2 lines
Make fix_imports refactor multiple imports as.
........
2008-12-15 23:35:28 -04:00
|
|
|
return node
|
2008-03-19 01:43:46 -03:00
|
|
|
|
Merged revisions 67427,67431,67433,67435,67630,67652,67656-67657,67674-67675,67678-67679,67705-67706,67716,67723,67765-67771,67774,67776,67778 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r67427 | benjamin.peterson | 2008-11-28 16:07:41 -0600 (Fri, 28 Nov 2008) | 1 line
fix spelling in comment
........
r67431 | benjamin.peterson | 2008-11-28 17:14:08 -0600 (Fri, 28 Nov 2008) | 1 line
add a scripts directory; move things to it
........
r67433 | benjamin.peterson | 2008-11-28 17:18:48 -0600 (Fri, 28 Nov 2008) | 1 line
run svneol.py
........
r67435 | benjamin.peterson | 2008-11-28 17:25:03 -0600 (Fri, 28 Nov 2008) | 1 line
rename pre/post_order_mapping to pre/post_order_heads
........
r67630 | alexandre.vassalotti | 2008-12-06 21:51:56 -0600 (Sat, 06 Dec 2008) | 2 lines
Fix typo in the urllib2.HTTPDigestAuthHandler fixer.
........
r67652 | armin.ronacher | 2008-12-07 15:39:43 -0600 (Sun, 07 Dec 2008) | 5 lines
Added a fixer that cleans up a tuple argument to isinstance after the tokens
in it were fixed. This is mainly used to remove double occurrences of
tokens as a leftover of the long -> int / unicode -> str conversion.
........
r67656 | armin.ronacher | 2008-12-07 16:54:16 -0600 (Sun, 07 Dec 2008) | 3 lines
Added missing copyright fo 2to3 fix_isinstance.
........
r67657 | armin.ronacher | 2008-12-07 18:29:35 -0600 (Sun, 07 Dec 2008) | 3 lines
2to3: intern and reduce fixes now add the imports if missing. Because that is a common task the fixer_util module now has a function "touch_import" that adds imports if missing.
........
r67674 | benjamin.peterson | 2008-12-08 19:58:11 -0600 (Mon, 08 Dec 2008) | 1 line
copy permission bits when making backup files #4602
........
r67675 | benjamin.peterson | 2008-12-08 19:59:11 -0600 (Mon, 08 Dec 2008) | 1 line
add forgotten import
........
r67678 | benjamin.peterson | 2008-12-08 20:08:30 -0600 (Mon, 08 Dec 2008) | 1 line
fix #4602 for real
........
r67679 | armin.ronacher | 2008-12-09 00:54:03 -0600 (Tue, 09 Dec 2008) | 3 lines
Removed redudant code from the 2to3 long fixer. This fixes #4590.
........
r67705 | benjamin.peterson | 2008-12-11 13:04:08 -0600 (Thu, 11 Dec 2008) | 1 line
put trailers after a range call after the list()
........
r67706 | benjamin.peterson | 2008-12-11 13:17:57 -0600 (Thu, 11 Dec 2008) | 1 line
add html related modules to the fix_imports mapping
........
r67716 | benjamin.peterson | 2008-12-11 22:16:47 -0600 (Thu, 11 Dec 2008) | 1 line
consolidate tests
........
r67723 | benjamin.peterson | 2008-12-12 19:49:31 -0600 (Fri, 12 Dec 2008) | 1 line
fix name
........
r67765 | benjamin.peterson | 2008-12-14 14:05:05 -0600 (Sun, 14 Dec 2008) | 1 line
run fix_isinstance after fix_long and fix_unicode
........
r67766 | benjamin.peterson | 2008-12-14 14:13:05 -0600 (Sun, 14 Dec 2008) | 1 line
use run_order instead of order
........
r67767 | benjamin.peterson | 2008-12-14 14:28:12 -0600 (Sun, 14 Dec 2008) | 1 line
don't retain parenthesis if there is only one item left
........
r67768 | benjamin.peterson | 2008-12-14 14:32:30 -0600 (Sun, 14 Dec 2008) | 1 line
use insert_child()
........
r67769 | benjamin.peterson | 2008-12-14 14:59:10 -0600 (Sun, 14 Dec 2008) | 1 line
parenthesize doesn't belong in pygram or FixerBase
........
r67770 | alexandre.vassalotti | 2008-12-14 15:15:36 -0600 (Sun, 14 Dec 2008) | 2 lines
Fix typo: html.paser -> html.parser.
........
r67771 | benjamin.peterson | 2008-12-14 15:22:09 -0600 (Sun, 14 Dec 2008) | 1 line
altering .children needs to call changed()
........
r67774 | benjamin.peterson | 2008-12-14 15:55:38 -0600 (Sun, 14 Dec 2008) | 1 line
employ an evil hack to fix multiple names in the same import statement
........
r67776 | benjamin.peterson | 2008-12-14 16:22:38 -0600 (Sun, 14 Dec 2008) | 1 line
make a common mixin class for Test_imports and friends
........
r67778 | alexandre.vassalotti | 2008-12-14 17:48:20 -0600 (Sun, 14 Dec 2008) | 2 lines
Make fix_imports refactor multiple imports as.
........
2008-12-15 23:35:28 -04:00
|
|
|
def does_tree_import(package, name, node):
|
|
|
|
""" Returns true if name is imported from package at the
|
|
|
|
top level of the tree which node belongs to.
|
|
|
|
To cover the case of an import like 'import foo', use
|
|
|
|
None for the package and 'foo' for the name. """
|
|
|
|
binding = find_binding(name, find_root(node), package)
|
2008-03-19 01:43:46 -03:00
|
|
|
return bool(binding)
|
|
|
|
|
Merged revisions 67427,67431,67433,67435,67630,67652,67656-67657,67674-67675,67678-67679,67705-67706,67716,67723,67765-67771,67774,67776,67778 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r67427 | benjamin.peterson | 2008-11-28 16:07:41 -0600 (Fri, 28 Nov 2008) | 1 line
fix spelling in comment
........
r67431 | benjamin.peterson | 2008-11-28 17:14:08 -0600 (Fri, 28 Nov 2008) | 1 line
add a scripts directory; move things to it
........
r67433 | benjamin.peterson | 2008-11-28 17:18:48 -0600 (Fri, 28 Nov 2008) | 1 line
run svneol.py
........
r67435 | benjamin.peterson | 2008-11-28 17:25:03 -0600 (Fri, 28 Nov 2008) | 1 line
rename pre/post_order_mapping to pre/post_order_heads
........
r67630 | alexandre.vassalotti | 2008-12-06 21:51:56 -0600 (Sat, 06 Dec 2008) | 2 lines
Fix typo in the urllib2.HTTPDigestAuthHandler fixer.
........
r67652 | armin.ronacher | 2008-12-07 15:39:43 -0600 (Sun, 07 Dec 2008) | 5 lines
Added a fixer that cleans up a tuple argument to isinstance after the tokens
in it were fixed. This is mainly used to remove double occurrences of
tokens as a leftover of the long -> int / unicode -> str conversion.
........
r67656 | armin.ronacher | 2008-12-07 16:54:16 -0600 (Sun, 07 Dec 2008) | 3 lines
Added missing copyright fo 2to3 fix_isinstance.
........
r67657 | armin.ronacher | 2008-12-07 18:29:35 -0600 (Sun, 07 Dec 2008) | 3 lines
2to3: intern and reduce fixes now add the imports if missing. Because that is a common task the fixer_util module now has a function "touch_import" that adds imports if missing.
........
r67674 | benjamin.peterson | 2008-12-08 19:58:11 -0600 (Mon, 08 Dec 2008) | 1 line
copy permission bits when making backup files #4602
........
r67675 | benjamin.peterson | 2008-12-08 19:59:11 -0600 (Mon, 08 Dec 2008) | 1 line
add forgotten import
........
r67678 | benjamin.peterson | 2008-12-08 20:08:30 -0600 (Mon, 08 Dec 2008) | 1 line
fix #4602 for real
........
r67679 | armin.ronacher | 2008-12-09 00:54:03 -0600 (Tue, 09 Dec 2008) | 3 lines
Removed redudant code from the 2to3 long fixer. This fixes #4590.
........
r67705 | benjamin.peterson | 2008-12-11 13:04:08 -0600 (Thu, 11 Dec 2008) | 1 line
put trailers after a range call after the list()
........
r67706 | benjamin.peterson | 2008-12-11 13:17:57 -0600 (Thu, 11 Dec 2008) | 1 line
add html related modules to the fix_imports mapping
........
r67716 | benjamin.peterson | 2008-12-11 22:16:47 -0600 (Thu, 11 Dec 2008) | 1 line
consolidate tests
........
r67723 | benjamin.peterson | 2008-12-12 19:49:31 -0600 (Fri, 12 Dec 2008) | 1 line
fix name
........
r67765 | benjamin.peterson | 2008-12-14 14:05:05 -0600 (Sun, 14 Dec 2008) | 1 line
run fix_isinstance after fix_long and fix_unicode
........
r67766 | benjamin.peterson | 2008-12-14 14:13:05 -0600 (Sun, 14 Dec 2008) | 1 line
use run_order instead of order
........
r67767 | benjamin.peterson | 2008-12-14 14:28:12 -0600 (Sun, 14 Dec 2008) | 1 line
don't retain parenthesis if there is only one item left
........
r67768 | benjamin.peterson | 2008-12-14 14:32:30 -0600 (Sun, 14 Dec 2008) | 1 line
use insert_child()
........
r67769 | benjamin.peterson | 2008-12-14 14:59:10 -0600 (Sun, 14 Dec 2008) | 1 line
parenthesize doesn't belong in pygram or FixerBase
........
r67770 | alexandre.vassalotti | 2008-12-14 15:15:36 -0600 (Sun, 14 Dec 2008) | 2 lines
Fix typo: html.paser -> html.parser.
........
r67771 | benjamin.peterson | 2008-12-14 15:22:09 -0600 (Sun, 14 Dec 2008) | 1 line
altering .children needs to call changed()
........
r67774 | benjamin.peterson | 2008-12-14 15:55:38 -0600 (Sun, 14 Dec 2008) | 1 line
employ an evil hack to fix multiple names in the same import statement
........
r67776 | benjamin.peterson | 2008-12-14 16:22:38 -0600 (Sun, 14 Dec 2008) | 1 line
make a common mixin class for Test_imports and friends
........
r67778 | alexandre.vassalotti | 2008-12-14 17:48:20 -0600 (Sun, 14 Dec 2008) | 2 lines
Make fix_imports refactor multiple imports as.
........
2008-12-15 23:35:28 -04:00
|
|
|
def is_import(node):
|
|
|
|
"""Returns true if the node is an import statement."""
|
|
|
|
return node.type in (syms.import_name, syms.import_from)
|
|
|
|
|
|
|
|
def touch_import(package, name, node):
|
|
|
|
""" Works like `does_tree_import` but adds an import statement
|
|
|
|
if it was not imported. """
|
|
|
|
def is_import_stmt(node):
|
|
|
|
return node.type == syms.simple_stmt and node.children and \
|
|
|
|
is_import(node.children[0])
|
|
|
|
|
|
|
|
root = find_root(node)
|
|
|
|
|
|
|
|
if does_tree_import(package, name, root):
|
|
|
|
return
|
|
|
|
|
|
|
|
add_newline_before = False
|
|
|
|
|
|
|
|
# figure out where to insert the new import. First try to find
|
|
|
|
# the first import and then skip to the last one.
|
|
|
|
insert_pos = offset = 0
|
|
|
|
for idx, node in enumerate(root.children):
|
|
|
|
if not is_import_stmt(node):
|
|
|
|
continue
|
|
|
|
for offset, node2 in enumerate(root.children[idx:]):
|
|
|
|
if not is_import_stmt(node2):
|
|
|
|
break
|
|
|
|
insert_pos = idx + offset
|
|
|
|
break
|
|
|
|
|
|
|
|
# if there are no imports where we can insert, find the docstring.
|
|
|
|
# if that also fails, we stick to the beginning of the file
|
|
|
|
if insert_pos == 0:
|
|
|
|
for idx, node in enumerate(root.children):
|
|
|
|
if node.type == syms.simple_stmt and node.children and \
|
|
|
|
node.children[0].type == token.STRING:
|
|
|
|
insert_pos = idx + 1
|
|
|
|
add_newline_before
|
|
|
|
break
|
|
|
|
|
|
|
|
if package is None:
|
|
|
|
import_ = Node(syms.import_name, [
|
|
|
|
Leaf(token.NAME, 'import'),
|
|
|
|
Leaf(token.NAME, name, prefix=' ')
|
|
|
|
])
|
|
|
|
else:
|
|
|
|
import_ = FromImport(package, [Leaf(token.NAME, name, prefix=' ')])
|
|
|
|
|
|
|
|
children = [import_, Newline()]
|
|
|
|
if add_newline_before:
|
|
|
|
children.insert(0, Newline())
|
|
|
|
root.insert_child(insert_pos, Node(syms.simple_stmt, children))
|
|
|
|
|
|
|
|
|
2008-03-19 01:43:46 -03:00
|
|
|
_def_syms = set([syms.classdef, syms.funcdef])
|
|
|
|
def find_binding(name, node, package=None):
|
|
|
|
""" Returns the node which binds variable name, otherwise None.
|
|
|
|
If optional argument package is supplied, only imports will
|
|
|
|
be returned.
|
|
|
|
See test cases for examples."""
|
|
|
|
for child in node.children:
|
|
|
|
ret = None
|
|
|
|
if child.type == syms.for_stmt:
|
|
|
|
if _find(name, child.children[1]):
|
|
|
|
return child
|
|
|
|
n = find_binding(name, make_suite(child.children[-1]), package)
|
|
|
|
if n: ret = n
|
|
|
|
elif child.type in (syms.if_stmt, syms.while_stmt):
|
|
|
|
n = find_binding(name, make_suite(child.children[-1]), package)
|
|
|
|
if n: ret = n
|
|
|
|
elif child.type == syms.try_stmt:
|
|
|
|
n = find_binding(name, make_suite(child.children[2]), package)
|
|
|
|
if n:
|
|
|
|
ret = n
|
|
|
|
else:
|
|
|
|
for i, kid in enumerate(child.children[3:]):
|
|
|
|
if kid.type == token.COLON and kid.value == ":":
|
|
|
|
# i+3 is the colon, i+4 is the suite
|
|
|
|
n = find_binding(name, make_suite(child.children[i+4]), package)
|
|
|
|
if n: ret = n
|
|
|
|
elif child.type in _def_syms and child.children[1].value == name:
|
|
|
|
ret = child
|
|
|
|
elif _is_import_binding(child, name, package):
|
|
|
|
ret = child
|
|
|
|
elif child.type == syms.simple_stmt:
|
|
|
|
ret = find_binding(name, child, package)
|
|
|
|
elif child.type == syms.expr_stmt:
|
2008-03-19 02:22:42 -03:00
|
|
|
if _find(name, child.children[0]):
|
|
|
|
ret = child
|
2008-03-19 01:43:46 -03:00
|
|
|
|
|
|
|
if ret:
|
|
|
|
if not package:
|
|
|
|
return ret
|
Merged revisions 67427,67431,67433,67435,67630,67652,67656-67657,67674-67675,67678-67679,67705-67706,67716,67723,67765-67771,67774,67776,67778 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r67427 | benjamin.peterson | 2008-11-28 16:07:41 -0600 (Fri, 28 Nov 2008) | 1 line
fix spelling in comment
........
r67431 | benjamin.peterson | 2008-11-28 17:14:08 -0600 (Fri, 28 Nov 2008) | 1 line
add a scripts directory; move things to it
........
r67433 | benjamin.peterson | 2008-11-28 17:18:48 -0600 (Fri, 28 Nov 2008) | 1 line
run svneol.py
........
r67435 | benjamin.peterson | 2008-11-28 17:25:03 -0600 (Fri, 28 Nov 2008) | 1 line
rename pre/post_order_mapping to pre/post_order_heads
........
r67630 | alexandre.vassalotti | 2008-12-06 21:51:56 -0600 (Sat, 06 Dec 2008) | 2 lines
Fix typo in the urllib2.HTTPDigestAuthHandler fixer.
........
r67652 | armin.ronacher | 2008-12-07 15:39:43 -0600 (Sun, 07 Dec 2008) | 5 lines
Added a fixer that cleans up a tuple argument to isinstance after the tokens
in it were fixed. This is mainly used to remove double occurrences of
tokens as a leftover of the long -> int / unicode -> str conversion.
........
r67656 | armin.ronacher | 2008-12-07 16:54:16 -0600 (Sun, 07 Dec 2008) | 3 lines
Added missing copyright fo 2to3 fix_isinstance.
........
r67657 | armin.ronacher | 2008-12-07 18:29:35 -0600 (Sun, 07 Dec 2008) | 3 lines
2to3: intern and reduce fixes now add the imports if missing. Because that is a common task the fixer_util module now has a function "touch_import" that adds imports if missing.
........
r67674 | benjamin.peterson | 2008-12-08 19:58:11 -0600 (Mon, 08 Dec 2008) | 1 line
copy permission bits when making backup files #4602
........
r67675 | benjamin.peterson | 2008-12-08 19:59:11 -0600 (Mon, 08 Dec 2008) | 1 line
add forgotten import
........
r67678 | benjamin.peterson | 2008-12-08 20:08:30 -0600 (Mon, 08 Dec 2008) | 1 line
fix #4602 for real
........
r67679 | armin.ronacher | 2008-12-09 00:54:03 -0600 (Tue, 09 Dec 2008) | 3 lines
Removed redudant code from the 2to3 long fixer. This fixes #4590.
........
r67705 | benjamin.peterson | 2008-12-11 13:04:08 -0600 (Thu, 11 Dec 2008) | 1 line
put trailers after a range call after the list()
........
r67706 | benjamin.peterson | 2008-12-11 13:17:57 -0600 (Thu, 11 Dec 2008) | 1 line
add html related modules to the fix_imports mapping
........
r67716 | benjamin.peterson | 2008-12-11 22:16:47 -0600 (Thu, 11 Dec 2008) | 1 line
consolidate tests
........
r67723 | benjamin.peterson | 2008-12-12 19:49:31 -0600 (Fri, 12 Dec 2008) | 1 line
fix name
........
r67765 | benjamin.peterson | 2008-12-14 14:05:05 -0600 (Sun, 14 Dec 2008) | 1 line
run fix_isinstance after fix_long and fix_unicode
........
r67766 | benjamin.peterson | 2008-12-14 14:13:05 -0600 (Sun, 14 Dec 2008) | 1 line
use run_order instead of order
........
r67767 | benjamin.peterson | 2008-12-14 14:28:12 -0600 (Sun, 14 Dec 2008) | 1 line
don't retain parenthesis if there is only one item left
........
r67768 | benjamin.peterson | 2008-12-14 14:32:30 -0600 (Sun, 14 Dec 2008) | 1 line
use insert_child()
........
r67769 | benjamin.peterson | 2008-12-14 14:59:10 -0600 (Sun, 14 Dec 2008) | 1 line
parenthesize doesn't belong in pygram or FixerBase
........
r67770 | alexandre.vassalotti | 2008-12-14 15:15:36 -0600 (Sun, 14 Dec 2008) | 2 lines
Fix typo: html.paser -> html.parser.
........
r67771 | benjamin.peterson | 2008-12-14 15:22:09 -0600 (Sun, 14 Dec 2008) | 1 line
altering .children needs to call changed()
........
r67774 | benjamin.peterson | 2008-12-14 15:55:38 -0600 (Sun, 14 Dec 2008) | 1 line
employ an evil hack to fix multiple names in the same import statement
........
r67776 | benjamin.peterson | 2008-12-14 16:22:38 -0600 (Sun, 14 Dec 2008) | 1 line
make a common mixin class for Test_imports and friends
........
r67778 | alexandre.vassalotti | 2008-12-14 17:48:20 -0600 (Sun, 14 Dec 2008) | 2 lines
Make fix_imports refactor multiple imports as.
........
2008-12-15 23:35:28 -04:00
|
|
|
if is_import(ret):
|
2008-03-19 01:43:46 -03:00
|
|
|
return ret
|
|
|
|
return None
|
|
|
|
|
|
|
|
_block_syms = set([syms.funcdef, syms.classdef, syms.trailer])
|
|
|
|
def _find(name, node):
|
|
|
|
nodes = [node]
|
|
|
|
while nodes:
|
|
|
|
node = nodes.pop()
|
|
|
|
if node.type > 256 and node.type not in _block_syms:
|
|
|
|
nodes.extend(node.children)
|
|
|
|
elif node.type == token.NAME and node.value == name:
|
|
|
|
return node
|
|
|
|
return None
|
|
|
|
|
|
|
|
def _is_import_binding(node, name, package=None):
|
|
|
|
""" Will reuturn node if node will import name, or node
|
|
|
|
will import * from package. None is returned otherwise.
|
|
|
|
See test cases for examples. """
|
|
|
|
|
|
|
|
if node.type == syms.import_name and not package:
|
|
|
|
imp = node.children[1]
|
|
|
|
if imp.type == syms.dotted_as_names:
|
|
|
|
for child in imp.children:
|
|
|
|
if child.type == syms.dotted_as_name:
|
|
|
|
if child.children[2].value == name:
|
|
|
|
return node
|
|
|
|
elif child.type == token.NAME and child.value == name:
|
|
|
|
return node
|
|
|
|
elif imp.type == syms.dotted_as_name:
|
|
|
|
last = imp.children[-1]
|
|
|
|
if last.type == token.NAME and last.value == name:
|
|
|
|
return node
|
|
|
|
elif imp.type == token.NAME and imp.value == name:
|
|
|
|
return node
|
|
|
|
elif node.type == syms.import_from:
|
|
|
|
# unicode(...) is used to make life easier here, because
|
|
|
|
# from a.b import parses to ['import', ['a', '.', 'b'], ...]
|
|
|
|
if package and unicode(node.children[1]).strip() != package:
|
|
|
|
return None
|
|
|
|
n = node.children[3]
|
|
|
|
if package and _find('as', n):
|
|
|
|
# See test_from_import_as for explanation
|
|
|
|
return None
|
|
|
|
elif n.type == syms.import_as_names and _find(name, n):
|
|
|
|
return node
|
|
|
|
elif n.type == syms.import_as_name:
|
|
|
|
child = n.children[2]
|
|
|
|
if child.type == token.NAME and child.value == name:
|
|
|
|
return node
|
|
|
|
elif n.type == token.NAME and n.value == name:
|
|
|
|
return node
|
|
|
|
elif package and n.type == token.STAR:
|
|
|
|
return node
|
|
|
|
return None
|