[Python-checkins] cpython: Issue #24136: Adjust f-strings doc for interable unpacking

Sat Jun 11 22:06:36 EDT 2016

https://hg.python.org/cpython/rev/2c10f0e92256
changeset: 101911:2c10f0e92256
user: Martin Panter <vadmium+py at gmail.com>
date: Sun Jun 12 01:56:24 2016 +0000
summary:
 Issue #24136: Adjust f-strings doc for interable unpacking
files:
 Doc/reference/lexical_analysis.rst | 3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst
--- a/Doc/reference/lexical_analysis.rst
+++ b/Doc/reference/lexical_analysis.rst
@@ -619,7 +619,8 @@
 .. productionlist::
 f_string: (`literal_char` | "{{" | "}}" | `replacement_field`)*
 replacement_field: "{" `f_expression` ["!" `conversion`] [":" `format_spec`] "}"
- f_expression: `conditional_expression` ("," `conditional_expression`)* [","]
+ f_expression: (`conditional_expression` | "*" `or_expr`)
+ : ("," `conditional_expression` | "," "*" `or_expr`)* [","]
 : | `yield_expression`
 conversion: "s" | "r" | "a"
 format_spec: (`literal_char` | NULL | `replacement_field`)*
-- 
Repository URL: https://hg.python.org/cpython
