From: Martin Panter <vadmium+py@gmail.com>
Date: Sun, 12 Jun 2016 01:56:24 +0000 (+0000)
Subject: Issue #24136: Adjust f-strings doc for interable unpacking
X-Git-Tag: v3.6.0a2~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed74e243c6833b12984b9b7e03d71396b134ceab;p=thirdparty%2FPython%2Fcpython.git

Issue #24136: Adjust f-strings doc for interable unpacking
---

diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst
index fa65c0c63677..7af1b28e0f54 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`)*