summaryrefslogtreecommitdiffstats
path: root/Doc/reference
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-06-12 01:56:24 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-06-12 01:56:24 (GMT)
commited74e243c6833b12984b9b7e03d71396b134ceab (patch)
treecdb670a421f57c68029f76dc68439bcf5aab7ed2 /Doc/reference
parent99cb0cda15152c3d0f5c405caa12dca190591b8f (diff)
downloadcpython-ed74e243c6833b12984b9b7e03d71396b134ceab.zip
cpython-ed74e243c6833b12984b9b7e03d71396b134ceab.tar.gz
cpython-ed74e243c6833b12984b9b7e03d71396b134ceab.tar.bz2
Issue #24136: Adjust f-strings doc for interable unpacking
Diffstat (limited to 'Doc/reference')
-rw-r--r--Doc/reference/lexical_analysis.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst
index fa65c0c..7af1b28 100644
--- a/Doc/reference/lexical_analysis.rst
+++ b/Doc/reference/lexical_analysis.rst
@@ -619,7 +619,8 @@ for the contents of the string is:
.. 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`)*