Merge branch 'main' into emptyline

AUTHORS.md

@@ -24,6 +24,7 @@ Multiple contributions by:
 - [Alex Vandiver](mailto:[email protected])
 - [Allan Simon](mailto:[email protected])
 - Anders-Petter Ljungquist
+- [Amethyst Reese](mailto:[email protected])
 - [Andrew Thorp](mailto:[email protected])
 - [Andrew Zhou](mailto:[email protected])
 - [Andrey](mailto:[email protected])

CHANGES.md

@@ -28,6 +28,10 @@
 
 <!-- Changes to the parser or to version autodetection -->
 
+- Parsing support has been added for walruses inside generator expression that are
+  passed as function args (for example,
+  `any(match := my_re.match(text) for text in texts)`) (#3327).
+
 ### Performance
 
 <!-- Changes that improve Black's performance. -->

docs/integrations/github_actions.md

@@ -44,7 +44,9 @@ extra. Installing the extra and including Jupyter Notebook files can be configur
 `jupyter` (default is `false`).
 
 You can also configure the arguments passed to _Black_ via `options` (defaults to
-`'--check --diff'`) and `src` (default is `'.'`)
+`'--check --diff'`) and `src` (default is `'.'`). Please note that the
+[`--check` flag](labels/exit-code) is required so that the workflow fails if _Black_
+finds files that need to be formatted.
 
 Here's an example configuration:
 

docs/usage_and_configuration/the_basics.md

@@ -76,6 +76,8 @@ _Black_ to just tell you what it _would_ do without actually rewriting the Pytho
 There's two variations to this mode that are independently enabled by their respective
 flags. Both variations can be enabled at once.
 
+(labels/exit-code)=
+
 #### Exit code
 
 Passing `--check` will make _Black_ exit with:

pyproject.toml

@@ -32,7 +32,7 @@ build-backend = "hatchling.build"
 [project]
 name = "black"
 description = "The uncompromising code formatter."
-license = "MIT"
+license = { text = "MIT" }
 requires-python = ">=3.7"
 authors = [
   { name = "Łukasz Langa", email = "[email protected]" },

src/black/parsing.py

@@ -165,8 +165,6 @@ def parse_single_version(
         # comments separately.
         return ast3.parse(src, filename, feature_version=version[1])
 
-    raise AssertionError("INTERNAL ERROR: Tried parsing unsupported Python version!")
-
 
 def parse_ast(src: str) -> Union[ast.AST, ast3.AST]:
     # TODO: support Python 4+ ;)

src/blib2to3/Grammar.txt

@@ -186,7 +186,7 @@ arglist: argument (',' argument)* [',']
 # multiple (test comp_for) arguments are blocked; keyword unpackings
 # that precede iterable unpackings are blocked; etc.
 argument: ( test [comp_for] |
-            test ':=' test |
+            test ':=' test [comp_for] |
             test 'as' test |
             test '=' asexpr_test |
 	    '**' test |

tests/data/py_310/pep_572_py310.py

@@ -2,3 +2,14 @@
 x[a:=0]
 x[a:=0, b:=1]
 x[5, b:=0]
+
+# Walruses are allowed inside generator expressions on function calls since 3.10.
+if any(match := pattern_error.match(s) for s in buffer):
+    if match.group(2) == data_not_available:
+        # Error OK to ignore.
+        pass
+
+f(a := b + c for c in range(10))
+f((a := b + c for c in range(10)), x)
+f(y=(a := b + c for c in range(10)))
+f(x, (a := b + c for c in range(10)), y=z, **q)