[Python-checkins] r79312 - in python/branches/release26-maint: Lib/lib2to3 Lib/lib2to3/fixes/fix_exitfunc.py

Mon Mar 22 23:57:30 CET 2010

Author: benjamin.peterson
Date: Mon Mar 22 23:57:30 2010
New Revision: 79312
Log:
Merged revisions 79311 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
................
 r79311 | benjamin.peterson | 2010年03月22日 17:54:42 -0500 (2010年3月22日) | 9 lines
 
 Merged revisions 79309 via svnmerge from 
 svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
 
 ........
 r79309 | benjamin.peterson | 2010年03月22日 17:50:47 -0500 (2010年3月22日) | 1 line
 
 pass correct symbol in
 ........
................
Modified:
 python/branches/release26-maint/ (props changed)
 python/branches/release26-maint/Lib/lib2to3/ (props changed)
 python/branches/release26-maint/Lib/lib2to3/fixes/fix_exitfunc.py
Modified: python/branches/release26-maint/Lib/lib2to3/fixes/fix_exitfunc.py
==============================================================================

--- python/branches/release26-maint/Lib/lib2to3/fixes/fix_exitfunc.py	(original)
+++ python/branches/release26-maint/Lib/lib2to3/fixes/fix_exitfunc.py	Mon Mar 22 23:57:30 2010
@@ -62,7 +62,7 @@
 containing_stmt = self.sys_import.parent
 position = containing_stmt.children.index(self.sys_import)
 stmt_container = containing_stmt.parent
- new_import = pytree.Node("import_name",
+ new_import = pytree.Node(syms.import_name,
 [Name("import"), Name("atexit", " ")]
 )
 new = pytree.Node("simple_stmt", [new_import])
