mirror of
https://github.com/python/cpython.git
synced 2025-07-25 04:04:13 +00:00
f733c60d9a
svn+ssh://pythondev@svn.python.org/python/trunk
................
r61602 | martin.v.loewis | 2008-03-19 00:22:42 -0500 (Mi, 19 Mär 2008) | 17 lines
Merged revisions 61598-61599,61601 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r61598 | david.wolever | 2008-03-18 23:58:33 -0500 (Di, 18 Mär 2008) | 1 line
Added fixer for zip, and refactored a bit of code in the process. Closing #2171.
........
r61599 | david.wolever | 2008-03-19 00:04:26 -0500 (Mi, 19 Mär 2008) | 3 lines
Removed a bunch of duplicate code -- it's in util now.
........
r61601 | martin.v.loewis | 2008-03-19 00:21:12 -0500 (Mi, 19 Mär 2008) | 2 lines
Fix whitespace.
........
................
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 basefix
|
|
|
|
class FixWsComma(basefix.BaseFix):
|
|
|
|
explicit = True # The user must ask for this fixers
|
|
|
|
PATTERN = """
|
|
any<(not(',') any)+ ',' ((not(',') any)+ ',')* [not(',') any]>
|
|
"""
|
|
|
|
COMMA = pytree.Leaf(token.COMMA, ",")
|
|
COLON = pytree.Leaf(token.COLON, ":")
|
|
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 "\n" not in prefix:
|
|
child.set_prefix("")
|
|
comma = True
|
|
else:
|
|
if comma:
|
|
prefix = child.get_prefix()
|
|
if not prefix:
|
|
child.set_prefix(" ")
|
|
comma = False
|
|
return new
|