#18741: merge with 3.3.

This commit is contained in:
Ezio Melotti 2013-08-17 16:13:22 +03:00
commit e0c69161bc
22 changed files with 38 additions and 36 deletions

View file

@ -34,8 +34,8 @@ class FixItertools(fixer_base.BaseFix):
# Remove the 'itertools'
prefix = it.prefix
it.remove()
# Replace the node wich contains ('.', 'function') with the
# function (to be consistant with the second part of the pattern)
# Replace the node which contains ('.', 'function') with the
# function (to be consistent with the second part of the pattern)
dot.remove()
func.parent.replace(func)

View file

@ -71,7 +71,7 @@ def fixup_parse_tree(cls_node):
def fixup_simple_stmt(parent, i, stmt_node):
""" if there is a semi-colon all the parts count as part of the same
simple_stmt. We just want the __metaclass__ part so we move
everything efter the semi-colon into its own simple_stmt node
everything after the semi-colon into its own simple_stmt node
"""
for semi_ind, node in enumerate(stmt_node.children):
if node.type == token.SEMI: # *sigh*