Merge 32e5544 into 9bd4134

CHANGES.md

@@ -30,6 +30,7 @@
 - Fix handling of standalone `match()` or `case()` when there is a trailing newline or a
   comment inside of the parentheses. (#2760)
 - Black now normalizes string prefix order (#2297)
+- Use parentheses with equality check in walrus/assigment statements (#2770)
 
 ### Packaging
 

src/black/__init__.py

@@ -1062,7 +1062,7 @@ def format_ipynb_string(src_contents: str, *, fast: bool, mode: Mode) -> FileCon
     Operate cell-by-cell, only on code cells, only for Python notebooks.
     If the ``.ipynb`` originally had a trailing newline, it'll be preserved.
     """
-    trailing_newline = src_contents[-1] == "\n"
+    trailing_newline = (src_contents[-1] == "\n")
     modified = False
     nb = json.loads(src_contents)
     validate_metadata(nb)

src/black/linegen.py

@@ -99,6 +99,27 @@ def visit_default(self, node: LN) -> Iterator[Line]:
                 self.current_line.append(node)
         yield from super().visit_default(node)
 
+    def visit_comparison(self, node: Node) -> Iterator[Line]:
+        parent: Optional[Node] = node.parent
+        grandparent: Optional[Node] = parent.parent if parent else None
+        if (
+            parent is not None
+            and Leaf(token.EQEQUAL, "==") in node.children
+            and (
+                parent.type == syms.namedexpr_test
+                or (
+                    grandparent is not None
+                    and grandparent.type in (syms.expr_stmt, syms.annassign)
+                )
+            )
+        ):
+            lpar = Leaf(token.LPAR, "(")
+            rpar = Leaf(token.RPAR, ")")
+            node.insert_child(0, lpar)
+            node.insert_child(len(node.children), rpar)
+
+        yield from self.visit_default(node)
+
     def visit_INDENT(self, node: Leaf) -> Iterator[Line]:
         """Increase indentation level, maybe yield a line."""
         # In blib2to3 INDENT never holds comments.

src/black/parsing.py

@@ -24,7 +24,7 @@
 
 ast3: Any
 
-_IS_PYPY = platform.python_implementation() == "PyPy"
+_IS_PYPY = (platform.python_implementation() == "PyPy")
 
 try:
     from typed_ast import ast3

src/black/trans.py

@@ -1397,7 +1397,7 @@ def passes_all_checks(i: Index) -> bool:
                 True iff ALL of the conditions listed in the 'Transformations'
                 section of this classes' docstring would be be met by returning @i.
             """
-            is_space = string[i] == " "
+            is_space = (string[i] == " ")
 
             is_not_escaped = True
             j = i - 1

src/black_primer/lib.py

@@ -29,7 +29,7 @@
 
 
 TEN_MINUTES_SECONDS = 600
-WINDOWS = system() == "Windows"
+WINDOWS = (system() == "Windows")
 BLACK_BINARY = "black.exe" if WINDOWS else "black"
 GIT_BINARY = "git.exe" if WINDOWS else "git"
 LOG = logging.getLogger(__name__)
@@ -158,7 +158,7 @@ async def black_run(
         )
         return
 
-    stdin_test = project_name.upper() == "STDIN"
+    stdin_test = (project_name.upper() == "STDIN")
     cmd = [str(which(BLACK_BINARY))]
     if "cli_arguments" in project_config and project_config["cli_arguments"]:
         cmd.extend(_flatten_cli_args(project_config["cli_arguments"]))
@@ -348,7 +348,7 @@ async def project_runner(
             continue
 
         repo_path: Optional[Path] = Path(__file__)
-        stdin_project = project_name.upper() == "STDIN"
+        stdin_project = (project_name.upper() == "STDIN")
         if not stdin_project:
             repo_path = await git_checkout_or_rebase(work_path, project_config, rebase)
             if not repo_path:

src/blackd/middlewares.py

@@ -10,7 +10,7 @@
 def cors(allow_headers: Iterable[str]) -> Middleware:
     @middleware
     async def impl(request: Request, handler: Handler) -> StreamResponse:
-        is_options = request.method == "OPTIONS"
+        is_options = (request.method == "OPTIONS")
         is_preflight = is_options and "Access-Control-Request-Method" in request.headers
         if is_preflight:
             resp = StreamResponse()

tests/data/paren_eq_check_in_assigments.py

@@ -0,0 +1,83 @@
+match_count += new_value == old_value
+
+if on_windows := os.name == "nt":
+    ...
+
+on_windows: bool = (os.name == "nt")
+
+implementation_version = (
+    platform.python_version() if platform.python_implementation() == "CPython" else "Unknown"
+)
+
+is_mac = platform.system() == 'Darwin'
+
+s = y == 2 + y == 4
+
+name1 = name2 = name3
+
+name1 == name2 == name3
+
+check_sockets(on_windows=os.name == "nt")
+
+if a := b == c:
+    pass
+
+a = [y := f(x) == True, y ** 2, y ** 3]
+
+a = lambda line: (m := re.match(pattern, line) == True)
+
+a = b in c and b == d
+
+a = b == c == d
+
+a = b == c in d
+
+a = b >= c == True
+
+a = b in c
+
+a = b > c
+
+# output
+
+match_count += (new_value == old_value)
+
+if on_windows := (os.name == "nt"):
+    ...
+
+on_windows: bool = (os.name == "nt")
+
+implementation_version = (
+    platform.python_version()
+    if platform.python_implementation() == "CPython"
+    else "Unknown"
+)
+
+is_mac = (platform.system() == "Darwin")
+
+s = (y == 2 + y == 4)
+
+name1 = name2 = name3
+
+name1 == name2 == name3
+
+check_sockets(on_windows=os.name == "nt")
+
+if a := (b == c):
+    pass
+
+a = [y := (f(x) == True), y ** 2, y ** 3]
+
+a = lambda line: (m := (re.match(pattern, line) == True))
+
+a = b in c and b == d
+
+a = (b == c == d)
+
+a = (b == c in d)
+
+a = (b >= c == True)
+
+a = b in c
+
+a = b > c

tests/test_format.py

@@ -48,6 +48,7 @@
     "function2",
     "function_trailing_comma",
     "import_spacing",
+    "parenthesized_context_managers",
     "remove_parens",
     "slices",
     "string_prefixes",