[Python-checkins] cpython (merge 3.6 -> default): Merge with 3.6

[jason.coombs]

https://hg.python.org/cpython/rev/5fda909c722c
changeset:   104926:5fda909c722c
parent:      104923:39f33c15243b
parent:      104925:1d8b8a67b657
user:        Jason R. Coombs <jaraco at jaraco.com>
date:        Sun Nov 06 11:16:42 2016 -0500
summary:
  Merge with 3.6

files:
  Lib/test/test_fstring.py |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


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

-- 
Repository URL: https://hg.python.org/cpython