Merged revisions 79138-79139,79306 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r79138 | benjamin.peterson | 2010-03-20 11:16:44 -0500 (Sat, 20 Mar 2010) | 1 line
document exitfunc fixer
................
r79139 | benjamin.peterson | 2010-03-20 11:17:37 -0500 (Sat, 20 Mar 2010) | 1 line
wrap
................
r79306 | benjamin.peterson | 2010-03-22 17:40:06 -0500 (Mon, 22 Mar 2010) | 21 lines
Merged revisions 79077,79137,79304-79305 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r79077 | benjamin.peterson | 2010-03-18 18:05:29 -0500 (Thu, 18 Mar 2010) | 1 line
port detect_encoding improvements from py3k
........
r79137 | benjamin.peterson | 2010-03-20 11:12:53 -0500 (Sat, 20 Mar 2010) | 1 line
add a fixer for setting sys.exitfunc #2356
........
r79304 | benjamin.peterson | 2010-03-22 17:20:22 -0500 (Mon, 22 Mar 2010) | 1 line
fix test_parser when it's run in a path with spaces #7666
........
r79305 | benjamin.peterson | 2010-03-22 17:27:07 -0500 (Mon, 22 Mar 2010) | 1 line
normalize whitespace
........
................
2010-03-22 19:47:20 -03:00
|
|
|
"""
|
|
|
|
Convert use of sys.exitfunc to use the atexit module.
|
|
|
|
"""
|
|
|
|
|
|
|
|
# Author: Benjamin Peterson
|
|
|
|
|
|
|
|
from lib2to3 import pytree, fixer_base
|
|
|
|
from lib2to3.fixer_util import Name, Attr, Call, Comma, Newline, syms
|
|
|
|
|
|
|
|
|
|
|
|
class FixExitfunc(fixer_base.BaseFix):
|
|
|
|
|
|
|
|
PATTERN = """
|
|
|
|
(
|
|
|
|
sys_import=import_name<'import'
|
|
|
|
('sys'
|
|
|
|
|
|
|
|
|
dotted_as_names< (any ',')* 'sys' (',' any)* >
|
|
|
|
)
|
|
|
|
>
|
|
|
|
|
|
|
|
|
expr_stmt<
|
|
|
|
power< 'sys' trailer< '.' 'exitfunc' > >
|
|
|
|
'=' func=any >
|
|
|
|
)
|
|
|
|
"""
|
|
|
|
|
|
|
|
def __init__(self, *args):
|
|
|
|
super(FixExitfunc, self).__init__(*args)
|
|
|
|
|
|
|
|
def start_tree(self, tree, filename):
|
|
|
|
super(FixExitfunc, self).start_tree(tree, filename)
|
|
|
|
self.sys_import = None
|
|
|
|
|
|
|
|
def transform(self, node, results):
|
|
|
|
# First, find a the sys import. We'll just hope it's global scope.
|
|
|
|
if "sys_import" in results:
|
|
|
|
if self.sys_import is None:
|
|
|
|
self.sys_import = results["sys_import"]
|
|
|
|
return
|
|
|
|
|
|
|
|
func = results["func"].clone()
|
|
|
|
func.prefix = ""
|
|
|
|
register = pytree.Node(syms.power,
|
|
|
|
Attr(Name("atexit"), Name("register"))
|
|
|
|
)
|
|
|
|
call = Call(register, [func], node.prefix)
|
|
|
|
node.replace(call)
|
|
|
|
|
|
|
|
if self.sys_import is None:
|
|
|
|
# That's interesting.
|
|
|
|
self.warning(node, "Can't find sys import; Please add an atexit "
|
|
|
|
"import at the top of your file.")
|
|
|
|
return
|
|
|
|
|
|
|
|
# Now add an atexit import after the sys import.
|
|
|
|
names = self.sys_import.children[1]
|
|
|
|
if names.type == syms.dotted_as_names:
|
|
|
|
names.append_child(Comma())
|
|
|
|
names.append_child(Name("atexit", " "))
|
|
|
|
else:
|
|
|
|
containing_stmt = self.sys_import.parent
|
|
|
|
position = containing_stmt.children.index(self.sys_import)
|
|
|
|
stmt_container = containing_stmt.parent
|
2010-03-22 19:57:30 -03:00
|
|
|
new_import = pytree.Node(syms.import_name,
|
Merged revisions 79138-79139,79306 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r79138 | benjamin.peterson | 2010-03-20 11:16:44 -0500 (Sat, 20 Mar 2010) | 1 line
document exitfunc fixer
................
r79139 | benjamin.peterson | 2010-03-20 11:17:37 -0500 (Sat, 20 Mar 2010) | 1 line
wrap
................
r79306 | benjamin.peterson | 2010-03-22 17:40:06 -0500 (Mon, 22 Mar 2010) | 21 lines
Merged revisions 79077,79137,79304-79305 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r79077 | benjamin.peterson | 2010-03-18 18:05:29 -0500 (Thu, 18 Mar 2010) | 1 line
port detect_encoding improvements from py3k
........
r79137 | benjamin.peterson | 2010-03-20 11:12:53 -0500 (Sat, 20 Mar 2010) | 1 line
add a fixer for setting sys.exitfunc #2356
........
r79304 | benjamin.peterson | 2010-03-22 17:20:22 -0500 (Mon, 22 Mar 2010) | 1 line
fix test_parser when it's run in a path with spaces #7666
........
r79305 | benjamin.peterson | 2010-03-22 17:27:07 -0500 (Mon, 22 Mar 2010) | 1 line
normalize whitespace
........
................
2010-03-22 19:47:20 -03:00
|
|
|
[Name("import"), Name("atexit", " ")]
|
|
|
|
)
|
|
|
|
new = pytree.Node("simple_stmt", [new_import])
|
|
|
|
containing_stmt.insert_child(position + 1, Newline())
|
|
|
|
containing_stmt.insert_child(position + 2, new)
|