diff options
| author | Georg Brandl <georg@python.org> | 2013-10-08 18:27:35 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2013-10-08 18:27:35 (GMT) |
| commit | 65087aec17a465aff3ee5e78fc70d7b9430e6c56 (patch) | |
| tree | 3b580d773047175984b7c3046a879c884a1c8aee | |
| parent | fe9e3b8e215c62cfcc4d8dc27bfd4586f8c6e4c2 (diff) | |
| parent | 1322f9e2d1a546328e53aa7d037bc37c3b47fc2e (diff) | |
| download | cpython-65087aec17a465aff3ee5e78fc70d7b9430e6c56.zip cpython-65087aec17a465aff3ee5e78fc70d7b9430e6c56.tar.gz cpython-65087aec17a465aff3ee5e78fc70d7b9430e6c56.tar.bz2 | |
merge heads
| -rw-r--r-- | Lib/lib2to3/fixes/fix_unicode.py | 3 | ||||
| -rw-r--r-- | Lib/lib2to3/tests/test_fixers.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Lib/lib2to3/fixes/fix_unicode.py b/Lib/lib2to3/fixes/fix_unicode.py index 6555397..c7982c2 100644 --- a/Lib/lib2to3/fixes/fix_unicode.py +++ b/Lib/lib2to3/fixes/fix_unicode.py @@ -28,8 +28,7 @@ class FixUnicode(fixer_base.BaseFix): return new elif node.type == token.STRING: val = node.value - if (not self.unicode_literals and val[0] in 'rR\'"' and - '\\' in val): + if not self.unicode_literals and val[0] in '\'"' and '\\' in val: val = r'\\'.join([ v.replace('\\u', r'\\u').replace('\\U', r'\\U') for v in val.split(r'\\') diff --git a/Lib/lib2to3/tests/test_fixers.py b/Lib/lib2to3/tests/test_fixers.py index 912bd4c..5b16bc3 100644 --- a/Lib/lib2to3/tests/test_fixers.py +++ b/Lib/lib2to3/tests/test_fixers.py @@ -2889,7 +2889,7 @@ class Test_unicode(FixerTestCase): self.check(b, a) b = r"""r'\\\u20ac\U0001d121\\u20ac'""" - a = r"""r'\\\\u20ac\\U0001d121\\u20ac'""" + a = r"""r'\\\u20ac\U0001d121\\u20ac'""" self.check(b, a) def test_bytes_literal_escape_u(self): |