diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2013-10-03 09:08:22 (GMT) |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2013-10-03 09:08:22 (GMT) |
commit | 0189a46ec59ca02feadcfde2840f4236756598da (patch) | |
tree | fb91c8d967ee46d87c059e73754be02593c8b4bd /Lib/lib2to3/fixes | |
parent | ebca3a5ab9bfb2a4bd2662619c3c8a9256fa1ed7 (diff) | |
download | cpython-0189a46ec59ca02feadcfde2840f4236756598da.zip cpython-0189a46ec59ca02feadcfde2840f4236756598da.tar.gz cpython-0189a46ec59ca02feadcfde2840f4236756598da.tar.bz2 |
Issue #18037: 2to3 now escapes '\u' and '\U' in native strings.
Diffstat (limited to 'Lib/lib2to3/fixes')
-rw-r--r-- | Lib/lib2to3/fixes/fix_unicode.py | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/Lib/lib2to3/fixes/fix_unicode.py b/Lib/lib2to3/fixes/fix_unicode.py index 6c89576..922486b 100644 --- a/Lib/lib2to3/fixes/fix_unicode.py +++ b/Lib/lib2to3/fixes/fix_unicode.py @@ -1,25 +1,43 @@ -"""Fixer that changes unicode to str, unichr to chr, and u"..." into "...". +r"""Fixer for unicode. + +* Changes unicode to str and unichr to chr. + +* If "...\u..." is not unicode literal change it into "...\\u...". + +* Change u"..." into "...". """ -import re from ..pgen2 import token from .. import fixer_base _mapping = {u"unichr" : u"chr", u"unicode" : u"str"} -_literal_re = re.compile(ur"[uU][rR]?[\'\"]") class FixUnicode(fixer_base.BaseFix): BM_compatible = True PATTERN = "STRING | 'unicode' | 'unichr'" + def start_tree(self, tree, filename): + super(FixUnicode, self).start_tree(tree, filename) + self.unicode_literals = 'unicode_literals' in tree.future_features + def transform(self, node, results): if node.type == token.NAME: new = node.clone() new.value = _mapping[node.value] return new elif node.type == token.STRING: - if _literal_re.match(node.value): - new = node.clone() - new.value = new.value[1:] - return new + val = node.value + if (not self.unicode_literals and val[0] in u'rR\'"' and + u'\\' in val): + val = ur'\\'.join([ + v.replace(u'\\u', ur'\\u').replace(u'\\U', ur'\\U') + for v in val.split(ur'\\') + ]) + if val[0] in u'uU': + val = val[1:] + if val == node.value: + return node + new = node.clone() + new.value = val + return new |