diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-05-09 01:01:14 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-05-09 01:01:14 (GMT) |
| commit | 84ad84e0bb15e7c64109e88060afdcb60ae7b740 (patch) | |
| tree | 5469c776c1f0fd812ae194e39544fca7dd3130b9 /Lib/lib2to3/fixes/fix_ws_comma.py | |
| parent | 5edb1a1b0add465bae25121ee4278a9ec6009005 (diff) | |
| download | cpython-84ad84e0bb15e7c64109e88060afdcb60ae7b740.zip cpython-84ad84e0bb15e7c64109e88060afdcb60ae7b740.tar.gz cpython-84ad84e0bb15e7c64109e88060afdcb60ae7b740.tar.bz2 | |
Merged revisions 72491-72493 via svnmerge from
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
........
Diffstat (limited to 'Lib/lib2to3/fixes/fix_ws_comma.py')
| -rw-r--r-- | Lib/lib2to3/fixes/fix_ws_comma.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Lib/lib2to3/fixes/fix_ws_comma.py b/Lib/lib2to3/fixes/fix_ws_comma.py index e493498..b5bfd8c 100644 --- a/Lib/lib2to3/fixes/fix_ws_comma.py +++ b/Lib/lib2to3/fixes/fix_ws_comma.py @@ -17,8 +17,8 @@ class FixWsComma(fixer_base.BaseFix): any<(not(',') any)+ ',' ((not(',') any)+ ',')* [not(',') any]> """ - COMMA = pytree.Leaf(token.COMMA, ",") - COLON = pytree.Leaf(token.COLON, ":") + COMMA = pytree.Leaf(token.COMMA, u",") + COLON = pytree.Leaf(token.COLON, u":") SEPS = (COMMA, COLON) def transform(self, node, results): @@ -27,13 +27,13 @@ class FixWsComma(fixer_base.BaseFix): 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("") + 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(" ") + child.set_prefix(u" ") comma = False return new |