mirror of
https://github.com/python/cpython.git
synced 2025-11-01 14:11:41 +00:00
84ad84e0bb
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r72491 | benjamin.peterson | 2009-05-08 19:33:27 -0500 (Fri, 08 May 2009) | 7 lines make 2to3 use unicode internally on 2.x This started out as a fix for #2660, but became this large refactoring when I realized the dire state this was in. 2to3 now uses tokenize.detect_encoding to decode the files correctly into unicode. ........ r72492 | benjamin.peterson | 2009-05-08 19:35:38 -0500 (Fri, 08 May 2009) | 1 line remove compat code ........ r72493 | benjamin.peterson | 2009-05-08 19:54:15 -0500 (Fri, 08 May 2009) | 1 line add a test for \r\n newlines ........
39 lines
1.1 KiB
Python
39 lines
1.1 KiB
Python
"""Fixer that changes 'a ,b' into 'a, b'.
|
|
|
|
This also changes '{a :b}' into '{a: b}', but does not touch other
|
|
uses of colons. It does not touch other uses of whitespace.
|
|
|
|
"""
|
|
|
|
from .. import pytree
|
|
from ..pgen2 import token
|
|
from .. import fixer_base
|
|
|
|
class FixWsComma(fixer_base.BaseFix):
|
|
|
|
explicit = True # The user must ask for this fixers
|
|
|
|
PATTERN = """
|
|
any<(not(',') any)+ ',' ((not(',') any)+ ',')* [not(',') any]>
|
|
"""
|
|
|
|
COMMA = pytree.Leaf(token.COMMA, u",")
|
|
COLON = pytree.Leaf(token.COLON, u":")
|
|
SEPS = (COMMA, COLON)
|
|
|
|
def transform(self, node, results):
|
|
new = node.clone()
|
|
comma = False
|
|
for child in new.children:
|
|
if child in self.SEPS:
|
|
prefix = child.get_prefix()
|
|
if prefix.isspace() and u"\n" not in prefix:
|
|
child.set_prefix(u"")
|
|
comma = True
|
|
else:
|
|
if comma:
|
|
prefix = child.get_prefix()
|
|
if not prefix:
|
|
child.set_prefix(u" ")
|
|
comma = False
|
|
return new
|