Merge with 3.6

This commit is contained in:
Jason R. Coombs 2016-11-06 11:16:42 -05:00
commit 32d93b2dc8
1 changed files with 2 additions and 0 deletions

View File

@ -378,6 +378,7 @@ f'{a * x()}'"""
r"rf'{\t3}'", r"rf'{\t3}'",
r"rf'{\}'", r"rf'{\}'",
r"""rf'{"\N{LEFT CURLY BRACKET}"}'""", r"""rf'{"\N{LEFT CURLY BRACKET}"}'""",
r"f'{\n}'",
]) ])
def test_no_escapes_for_braces(self): def test_no_escapes_for_braces(self):
@ -627,6 +628,7 @@ f'{a * x()}'"""
"f'}'", "f'}'",
"f'x}'", "f'x}'",
"f'x}x'", "f'x}x'",
r"f'\u007b}'",
# Can't have { or } in a format spec. # Can't have { or } in a format spec.
"f'{3:}>10}'", "f'{3:}>10}'",