bpo-33702: Add some missing links in production lists and do a little polish #7259

andresdelfino · 2018-05-30T23:52:47Z

https://bugs.python.org/issue33702

serhiy-storchaka · 2018-07-07T19:20:54Z

Doc/reference/compound_stmts.rst

-   parameter_list_starargs: "*" [`parameter`] ("," `defparameter`)* ["," ["**" `parameter` [","]]]
-                         : | "**" `parameter` [","]
+   parameter_list: `defparameter` ("," `defparameter`)*
+                 : ["," [`parameter_list_starargs`]] | `parameter_list_starargs`


I think it is better to left this and the following production lists as is.

serhiy-storchaka · 2018-07-07T19:22:52Z

Doc/reference/expressions.rst

   slice_list: `slice_item` ("," `slice_item`)* [","]
   slice_item: `expression` | `proper_slice`
-   proper_slice: [`lower_bound`] ":" [`upper_bound`] [ ":" [`stride`] ]
+   proper_slice: [`lower_bound`] ":" [`upper_bound`] [":" [`stride`]]


I think a space between ]'s increase readability. And the space after [ was added for symmetry.

serhiy-storchaka · 2018-07-07T19:24:14Z

Doc/reference/expressions.rst

   call: `primary` "(" [`argument_list` [","] | `comprehension`] ")"
   argument_list: `positional_arguments` ["," `starred_and_keywords`]
-                :   ["," `keywords_arguments`]
+                : ["," `keywords_arguments`]


Left it as is. Extra spaces help to see a difference between the continuation and the alternation.

serhiy-storchaka · 2018-07-07T19:25:32Z

Doc/reference/lexical_analysis.rst

   replacement_field: "{" `f_expression` ["!" `conversion`] [":" `format_spec`] "}"
   f_expression: (`conditional_expression` | "*" `or_expr`)
-               :   ("," `conditional_expression` | "," "*" `or_expr`)* [","]
+               : ("," `conditional_expression` | "," "*" `or_expr`)* [","]


Same as above.

serhiy-storchaka · 2018-07-07T19:27:11Z

Doc/reference/simple_stmts.rst

-              : ( "," `identifier` ["as" `name`] )*
-              : | "from" `relative_module` "import" "(" `identifier` ["as" `name`]
-              : ( "," `identifier` ["as" `name`] )* [","] ")"
+   import_stmt: "import" `module` ["as" `identifier`] ("," `module` ["as" `identifier`])*


Why name was replaced by identifier?

Because, when I added a link to name in future statements, it linked to the name in import statements. That's why I replaced name in both places to "identifier". Perhaps it can be solved in other way?

Ah, I see, the problem was that name was defined in two places. Then using an identifier LGTM. In the Grammar file the same term is used for the names before and after 'as' in import_from.

serhiy-storchaka · 2018-07-07T19:54:52Z

Doc/reference/compound_stmts.rst

                 : | `parameter_list_starargs`
-   parameter_list_starargs: "*" [`parameter`] ("," `defparameter`)* ["," ["**" `parameter` [","]]]
-                         : | "**" `parameter` [","]
+   parameter_list_starargs: "*" [`parameter`] ("," `defparameter`)*


It is better to break a line before | than at arbitrary place. I think it is better to keep the existing formatting. It is not much longer that the previous production list.

serhiy-storchaka · 2018-07-07T20:03:21Z

Doc/reference/simple_stmts.rst

-              : ( "," `identifier` ["as" `name`] )*
-              : | "from" `relative_module` "import" "(" `identifier` ["as" `name`]
-              : ( "," `identifier` ["as" `name`] )* [","] ")"
+   import_stmt: "import" `module` ["as" `identifier`] ("," `module` ["as" `identifier`])*


Ah, I see, the problem was that name was defined in two places. Then using an identifier LGTM. In the Grammar file the same term is used for the names before and after 'as' in import_from.

miss-islington · 2018-07-07T20:24:49Z

Thanks @andresdelfino for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 3.6, 3.7.
🐍🍒⛏🤖

… polish (pythonGH-7259) (cherry picked from commit caccca7) Co-authored-by: Andrés Delfino <adelfino@gmail.com>

bedevere-bot · 2018-07-07T20:25:56Z

GH-8169 is a backport of this pull request to the 3.7 branch.

… polish (pythonGH-7259) (cherry picked from commit caccca7) Co-authored-by: Andrés Delfino <adelfino@gmail.com>

bedevere-bot · 2018-07-07T20:26:57Z

GH-8170 is a backport of this pull request to the 3.6 branch.

… polish (GH-7259) (cherry picked from commit caccca7) Co-authored-by: Andrés Delfino <adelfino@gmail.com>

andresdelfino added 3 commits May 30, 2018 20:20

Initial commit

d59d9a1

Second commit

e69dfc4

Third commit

71148b3

the-knights-who-say-ni added the CLA signed label May 30, 2018

bedevere-bot added the awaiting review label May 30, 2018

serhiy-storchaka self-requested a review May 31, 2018 04:32

andresdelfino added 2 commits May 31, 2018 10:52

Fix whitespace

433fba9

Fix whitspace

96e5d9e

andresdelfino changed the title ~~bpo-33702: Add some missings links in production lists and a little polish~~ bpo-33702: Add some missing links in production lists and do a little polish Jun 11, 2018

serhiy-storchaka reviewed Jul 7, 2018

View reviewed changes

serhiy-storchaka added needs backport to 3.6 docs Documentation in the Doc dir skip news labels Jul 7, 2018

Address Serhiy comments

5b7a413

serhiy-storchaka reviewed Jul 7, 2018

View reviewed changes

Address new comments

f762477

serhiy-storchaka approved these changes Jul 7, 2018

View reviewed changes

bedevere-bot added awaiting merge and removed awaiting review labels Jul 7, 2018

serhiy-storchaka removed the needs backport to 2.7 label Jul 7, 2018

serhiy-storchaka merged commit caccca7 into python:master Jul 7, 2018

bedevere-bot removed the awaiting merge label Jul 7, 2018

bedevere-bot removed the needs backport to 3.7 label Jul 7, 2018

bedevere-bot removed the needs backport to 3.6 label Jul 7, 2018

andresdelfino deleted the add-missing-links branch July 7, 2018 21:06

miss-islington added a commit that referenced this pull request Jul 7, 2018

bpo-33702: Add some missing links in production lists and do a little…

80c188f

… polish (GH-7259) (cherry picked from commit caccca7) Co-authored-by: Andrés Delfino <adelfino@gmail.com>

miss-islington added a commit that referenced this pull request Jul 7, 2018

bpo-33702: Add some missing links in production lists and do a little…

445f9ed

… polish (GH-7259) (cherry picked from commit caccca7) Co-authored-by: Andrés Delfino <adelfino@gmail.com>

Uh oh!

bpo-33702: Add some missing links in production lists and do a little polish #7259

bpo-33702: Add some missing links in production lists and do a little polish #7259

Uh oh!

Conversation

andresdelfino commented May 30, 2018 • edited by bedevere-bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

miss-islington commented Jul 7, 2018

Uh oh!

bedevere-bot commented Jul 7, 2018

Uh oh!

bedevere-bot commented Jul 7, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

andresdelfino commented May 30, 2018 •

edited by bedevere-bot

Loading