summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-03-23 03:03:55 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-03-23 03:03:55 (GMT)
commit996e88a7d5dc94f060ef7be7d5235419841a492d (patch)
treeb682e54dcb5615fbb6df947f89084e7a194c4971
parent0d0b80bc3eb92e4abc8ffe26801f88af1a5c5890 (diff)
downloadcpython-996e88a7d5dc94f060ef7be7d5235419841a492d.zip
cpython-996e88a7d5dc94f060ef7be7d5235419841a492d.tar.gz
cpython-996e88a7d5dc94f060ef7be7d5235419841a492d.tar.bz2
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 ........
-rw-r--r--Lib/lib2to3/fixes/fix_exitfunc.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/Lib/lib2to3/fixes/fix_exitfunc.py b/Lib/lib2to3/fixes/fix_exitfunc.py
index 6ba2a67..28d30b8 100644
--- a/Lib/lib2to3/fixes/fix_exitfunc.py
+++ b/Lib/lib2to3/fixes/fix_exitfunc.py
@@ -40,9 +40,9 @@ class FixExitfunc(fixer_base.BaseFix):
return
func = results["func"].clone()
- func.prefix = ""
+ func.prefix = u""
register = pytree.Node(syms.power,
- Attr(Name("atexit"), Name("register"))
+ Attr(Name(u"atexit"), Name(u"register"))
)
call = Call(register, [func], node.prefix)
node.replace(call)
@@ -57,14 +57,14 @@ class FixExitfunc(fixer_base.BaseFix):
names = self.sys_import.children[1]
if names.type == syms.dotted_as_names:
names.append_child(Comma())
- names.append_child(Name("atexit", " "))
+ names.append_child(Name(u"atexit", u" "))
else:
containing_stmt = self.sys_import.parent
position = containing_stmt.children.index(self.sys_import)
stmt_container = containing_stmt.parent
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 + 2, new)