mirror of
https://github.com/python/cpython.git
synced 2025-10-31 05:31:20 +00:00
b0871cac11
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r85510 | benjamin.peterson | 2010-10-14 18:00:04 -0500 (Thu, 14 Oct 2010) | 61 lines
Merged revisions 83852-83853,83857,84042,84216,84274-84276,84375,85388,85478,85506-85508 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r83852 | benjamin.peterson | 2010-08-08 15:45:44 -0500 (Sun, 08 Aug 2010) | 1 line
wrap with parens
........
r83853 | benjamin.peterson | 2010-08-08 15:46:31 -0500 (Sun, 08 Aug 2010) | 1 line
use parens
........
r83857 | benjamin.peterson | 2010-08-08 15:59:49 -0500 (Sun, 08 Aug 2010) | 1 line
things which use touch_import should be pre order
........
r84042 | george.boutsioukis | 2010-08-14 16:10:19 -0500 (Sat, 14 Aug 2010) | 2 lines
This revision incorporates into the 2to3 tool the new, faster, tree matching algorithm developed during a GSOC project. The algorithm resides in the two added modules, btm_matcher and btm_utils. New code has been added to drive the new matching process in refactor.py and a few minor changes were made in other modules. A BM_compatible flag(False by default) has been added in fixer_base and it is set to True in most of the current fixers.
........
r84216 | benjamin.peterson | 2010-08-19 16:44:05 -0500 (Thu, 19 Aug 2010) | 1 line
allow star_expr in testlist_gexp
........
r84274 | benjamin.peterson | 2010-08-22 18:40:46 -0500 (Sun, 22 Aug 2010) | 1 line
wrap long line
........
r84275 | benjamin.peterson | 2010-08-22 18:42:22 -0500 (Sun, 22 Aug 2010) | 1 line
cleanup
........
r84276 | benjamin.peterson | 2010-08-22 18:51:01 -0500 (Sun, 22 Aug 2010) | 1 line
when there's a None value and a traceback, don't call type with it #9661
........
r84375 | george.boutsioukis | 2010-08-31 08:38:53 -0500 (Tue, 31 Aug 2010) | 3 lines
Idiomatic code changes & stylistic issues fixed in the BottomMatcher module. Thanks to Benjamin Peterson for taking the time to review the code.
........
r85388 | benjamin.peterson | 2010-10-12 17:27:44 -0500 (Tue, 12 Oct 2010) | 1 line
fix urllib fixer with multiple as imports on a line #10069
........
r85478 | benjamin.peterson | 2010-10-14 08:09:56 -0500 (Thu, 14 Oct 2010) | 1 line
stop abusing docstrings
........
r85506 | benjamin.peterson | 2010-10-14 17:45:19 -0500 (Thu, 14 Oct 2010) | 1 line
kill sibling import
........
r85507 | benjamin.peterson | 2010-10-14 17:54:15 -0500 (Thu, 14 Oct 2010) | 1 line
remove trailing whitespace
........
r85508 | benjamin.peterson | 2010-10-14 17:55:28 -0500 (Thu, 14 Oct 2010) | 1 line
typo
........
................
72 lines
2.4 KiB
Python
72 lines
2.4 KiB
Python
"""
|
|
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):
|
|
keep_line_order = True
|
|
BM_compatible = True
|
|
|
|
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
|
|
new_import = pytree.Node(syms.import_name,
|
|
[Name("import"), Name("atexit", " ")]
|
|
)
|
|
new = pytree.Node(syms.simple_stmt, [new_import])
|
|
containing_stmt.insert_child(position + 1, Newline())
|
|
containing_stmt.insert_child(position + 2, new)
|