Commit 996e88a7 authored by Benjamin Peterson's avatar Benjamin Peterson

Merged revisions 79313,79324 via svnmerge from

svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

........
  r79313 | benjamin.peterson | 2010-03-22 17:59:57 -0500 (Mon, 22 Mar 2010) | 1 line

  another case where a symbol is needed
........
  r79324 | benjamin.peterson | 2010-03-22 21:59:47 -0500 (Mon, 22 Mar 2010) | 1 line

  use unicode literals
........
parent 0d0b80bc
...@@ -40,9 +40,9 @@ class FixExitfunc(fixer_base.BaseFix): ...@@ -40,9 +40,9 @@ class FixExitfunc(fixer_base.BaseFix):
return return
func = results["func"].clone() func = results["func"].clone()
func.prefix = "" func.prefix = u""
register = pytree.Node(syms.power, register = pytree.Node(syms.power,
Attr(Name("atexit"), Name("register")) Attr(Name(u"atexit"), Name(u"register"))
) )
call = Call(register, [func], node.prefix) call = Call(register, [func], node.prefix)
node.replace(call) node.replace(call)
...@@ -57,14 +57,14 @@ class FixExitfunc(fixer_base.BaseFix): ...@@ -57,14 +57,14 @@ class FixExitfunc(fixer_base.BaseFix):
names = self.sys_import.children[1] names = self.sys_import.children[1]
if names.type == syms.dotted_as_names: if names.type == syms.dotted_as_names:
names.append_child(Comma()) names.append_child(Comma())
names.append_child(Name("atexit", " ")) names.append_child(Name(u"atexit", u" "))
else: else:
containing_stmt = self.sys_import.parent containing_stmt = self.sys_import.parent
position = containing_stmt.children.index(self.sys_import) position = containing_stmt.children.index(self.sys_import)
stmt_container = containing_stmt.parent stmt_container = containing_stmt.parent
new_import = pytree.Node(syms.import_name, new_import = pytree.Node(syms.import_name,
[Name("import"), Name("atexit", " ")] [Name(u"import"), Name(u"atexit", u" ")]
) )
new = pytree.Node("simple_stmt", [new_import]) new = pytree.Node(syms.simple_stmt, [new_import])
containing_stmt.insert_child(position + 1, Newline()) containing_stmt.insert_child(position + 1, Newline())
containing_stmt.insert_child(position + 2, new) containing_stmt.insert_child(position + 2, new)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment