mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 00:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

bpo-23894: make lib2to3 recognize f-strings (#1733)

Browse source 
Note: this doesn't unpack f-strings into the underlying JoinedStr AST.

Ideally we'd fully implement JoinedStr here but given its additional
complexity, I think this is worth bandaiding as is. This unblocks tools like
https://github.com/google/yapf to format 3.6 syntax using f-strings.
This commit is contained in:
Łukasz Langa 2017-05-22 16:35:48 -07:00 • committed by GitHub
parent ddbfa2c35b
commit 1b9530c536
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/lib2to3/pgen2/tokenize.py
View file

@ -74,7 +74,7 @@ Double = r'[^"\\]*(?:\\.[^"\\]*)*"'
Single3 = r"[^'\\]*(?:(?:\\.|'(?!''))[^'\\]*)*'''" Single3 = r"[^'\\]*(?:(?:\\.|'(?!''))[^'\\]*)*'''"
# Tail end of """ string. # Tail end of """ string.
Double3 = r'[^"\\]*(?:(?:\\.|"(?!""))[^"\\]*)*"""' Double3 = r'[^"\\]*(?:(?:\\.|"(?!""))[^"\\]*)*"""'
_litprefix = r"(?:[uUrRbB]|[rR][bB]|[bBuU][rR])?" _litprefix = r"(?:[uUrRbBfF]|[rR][bB]|[bBuU][rR])?"
Triple = group(_litprefix + "'''", _litprefix + '"""') Triple = group(_litprefix + "'''", _litprefix + '"""')
# Single-line ' or " string. # Single-line ' or " string.
String = group(_litprefix + r"'[^\n'\\]*(?:\\.[^\n'\\]*)*'", String = group(_litprefix + r"'[^\n'\\]*(?:\\.[^\n'\\]*)*'",
@ -110,12 +110,14 @@ endprogs = {"'": re.compile(Single), '"': re.compile(Double),
"r'''": single3prog, 'r"""': double3prog, "r'''": single3prog, 'r"""': double3prog,
"u'''": single3prog, 'u"""': double3prog, "u'''": single3prog, 'u"""': double3prog,
"b'''": single3prog, 'b"""': double3prog, "b'''": single3prog, 'b"""': double3prog,
"f'''": single3prog, 'f"""': double3prog,
"ur'''": single3prog, 'ur"""': double3prog, "ur'''": single3prog, 'ur"""': double3prog,
"br'''": single3prog, 'br"""': double3prog, "br'''": single3prog, 'br"""': double3prog,
"rb'''": single3prog, 'rb"""': double3prog, "rb'''": single3prog, 'rb"""': double3prog,
"R'''": single3prog, 'R"""': double3prog, "R'''": single3prog, 'R"""': double3prog,
"U'''": single3prog, 'U"""': double3prog, "U'''": single3prog, 'U"""': double3prog,
"B'''": single3prog, 'B"""': double3prog, "B'''": single3prog, 'B"""': double3prog,
"F'''": single3prog, 'F"""': double3prog,
"uR'''": single3prog, 'uR"""': double3prog, "uR'''": single3prog, 'uR"""': double3prog,
"Ur'''": single3prog, 'Ur"""': double3prog, "Ur'''": single3prog, 'Ur"""': double3prog,
"UR'''": single3prog, 'UR"""': double3prog, "UR'''": single3prog, 'UR"""': double3prog,
@ -127,6 +129,7 @@ endprogs = {"'": re.compile(Single), '"': re.compile(Double),
"RB'''": single3prog, 'RB"""': double3prog, "RB'''": single3prog, 'RB"""': double3prog,
'r': None, 'R': None, 'r': None, 'R': None,
'u': None, 'U': None, 'u': None, 'U': None,
'f': None, 'F': None,
'b': None, 'B': None} 'b': None, 'B': None}
triple_quoted = {} triple_quoted = {}
@ -134,6 +137,7 @@ for t in ("'''", '"""',
"r'''", 'r"""', "R'''", 'R"""', "r'''", 'r"""', "R'''", 'R"""',
"u'''", 'u"""', "U'''", 'U"""', "u'''", 'u"""', "U'''", 'U"""',
"b'''", 'b"""', "B'''", 'B"""', "b'''", 'b"""', "B'''", 'B"""',
"f'''", 'f"""', "F'''", 'F"""',
"ur'''", 'ur"""', "Ur'''", 'Ur"""', "ur'''", 'ur"""', "Ur'''", 'Ur"""',
"uR'''", 'uR"""', "UR'''", 'UR"""', "uR'''", 'uR"""', "UR'''", 'UR"""',
"br'''", 'br"""', "Br'''", 'Br"""', "br'''", 'br"""', "Br'''", 'Br"""',
@ -146,6 +150,7 @@ for t in ("'", '"',
"r'", 'r"', "R'", 'R"', "r'", 'r"', "R'", 'R"',
"u'", 'u"', "U'", 'U"', "u'", 'u"', "U'", 'U"',
"b'", 'b"', "B'", 'B"', "b'", 'b"', "B'", 'B"',
"f'", 'f"', "F'", 'F"',
"ur'", 'ur"', "Ur'", 'Ur"', "ur'", 'ur"', "Ur'", 'Ur"',
"uR'", 'uR"', "UR'", 'UR"', "uR'", 'uR"', "UR'", 'UR"',
"br'", 'br"', "Br'", 'Br"', "br'", 'br"', "Br'", 'Br"',

1
Lib/lib2to3/tests/test_parser.py
View file

@ -344,6 +344,7 @@ class TestStringLiterals(GrammarTest):
"r'", 'r"', "R'", 'R"', "r'", 'r"', "R'", 'R"',
"u'", 'u"', "U'", 'U"', "u'", 'u"', "U'", 'U"',
"b'", 'b"', "B'", 'B"', "b'", 'b"', "B'", 'B"',
"f'", 'f"', "F'", 'F"',
"ur'", 'ur"', "Ur'", 'Ur"', "ur'", 'ur"', "Ur'", 'Ur"',
"uR'", 'uR"', "UR'", 'UR"', "uR'", 'uR"', "UR'", 'UR"',
"br'", 'br"', "Br'", 'Br"', "br'", 'br"', "Br'", 'Br"',