mirror of
https://github.com/python/cpython.git
synced 2025-11-04 11:49:12 +00:00
f37eb3a184
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 ........
53 lines
1.7 KiB
Python
53 lines
1.7 KiB
Python
"""
|
|
Optional fixer to transform set() calls to set literals.
|
|
"""
|
|
|
|
# Author: Benjamin Peterson
|
|
|
|
from lib2to3 import fixer_base, pytree
|
|
from lib2to3.fixer_util import token, syms
|
|
|
|
|
|
|
|
class FixSetLiteral(fixer_base.BaseFix):
|
|
|
|
BM_compatible = True
|
|
explicit = True
|
|
|
|
PATTERN = """power< 'set' trailer< '('
|
|
(atom=atom< '[' (items=listmaker< any ((',' any)* [',']) >
|
|
|
|
|
single=any) ']' >
|
|
|
|
|
atom< '(' items=testlist_gexp< any ((',' any)* [',']) > ')' >
|
|
)
|
|
')' > >
|
|
"""
|
|
|
|
def transform(self, node, results):
|
|
single = results.get("single")
|
|
if single:
|
|
# Make a fake listmaker
|
|
fake = pytree.Node(syms.listmaker, [single.clone()])
|
|
single.replace(fake)
|
|
items = fake
|
|
else:
|
|
items = results["items"]
|
|
|
|
# Build the contents of the literal
|
|
literal = [pytree.Leaf(token.LBRACE, "{")]
|
|
literal.extend(n.clone() for n in items.children)
|
|
literal.append(pytree.Leaf(token.RBRACE, "}"))
|
|
# Set the prefix of the right brace to that of the ')' or ']'
|
|
literal[-1].prefix = items.next_sibling.prefix
|
|
maker = pytree.Node(syms.dictsetmaker, literal)
|
|
maker.prefix = node.prefix
|
|
|
|
# If the original was a one tuple, we need to remove the extra comma.
|
|
if len(maker.children) == 4:
|
|
n = maker.children[2]
|
|
n.remove()
|
|
maker.children[-1].prefix = n.prefix
|
|
|
|
# Finally, replace the set call with our shiny new literal.
|
|
return maker
|