From f962e9fde3183346979c3f370331408bac95e752 Mon Sep 17 00:00:00 2001
From: Wali Reheman <rw8143a@american.edu>
Date: Mon, 15 Jun 2026 09:11:26 -0400
Subject: [PATCH 1/2] fix B031 false positive when groupby variable used in
 if-else branches

Only one branch of an if-else executes at runtime, so using the
groupby variable in both branches shouldn't trigger B031.
Previously, ast.walk() visited both branches and counted the
variable twice, causing a false positive.
---
 bugbear.py | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/bugbear.py b/bugbear.py
index 329c435..d706540 100644
--- a/bugbear.py
+++ b/bugbear.py
@@ -1206,6 +1206,49 @@ def check_for_b031(self, loop_node: ast.For) -> None:  # noqa: C901
                     # Ignore any `groupby()` invocation that isn't unpacked
                     return
 
+                # Build parent map for this subtree so we can walk up
+                parent_map: dict[ast.AST, ast.AST] = {}
+
+                class ParentTracker(ast.NodeVisitor):
+                    def __init__(self) -> None:
+                        super().__init__()
+
+                    def generic_visit(self, node: ast.AST) -> None:
+                        for child in ast.iter_child_nodes(node):
+                            parent_map[child] = node
+                            self.generic_visit(child)
+
+                ParentTracker().visit(loop_node)
+
+                def branches_contain_same_name(if_node: ast.If, name: str) -> bool:
+                    """Check if name appears in BOTH branches of if_node."""
+                    body_contains = any(
+                        isinstance(n, ast.Name) and n.id == name
+                        for n in ast.walk(if_node.body[0])
+                    )
+                    else_contains = (
+                        bool(if_node.orelse)
+                        and any(
+                            isinstance(n, ast.Name) and n.id == name
+                            for n in ast.walk(if_node.orelse[0])
+                        )
+                    )
+                    return body_contains and else_contains
+
+                def is_in_if_branch_where_other_branch_has(
+                    name_node: ast.Name, name: str
+                ) -> bool:
+                    """Check if name_node is inside an if-else where the other branch also has name."""
+                    current = name_node
+                    while True:
+                        parent = parent_map.get(current)
+                        if parent is None:
+                            return False
+                        if isinstance(parent, ast.If) and parent.orelse:
+                            if branches_contain_same_name(parent, name):
+                                return True
+                        current = parent
+
                 num_usages = 0
                 for node in walk_list(loop_node.body):  # type: ignore[assignment]
                     # Handled nested loops
@@ -1220,6 +1263,12 @@ def check_for_b031(self, loop_node: ast.For) -> None:  # noqa: C901
 
                     # Handle multiple uses
                     if isinstance(node, ast.Name) and node.id == group_name:
+                        # Skip if this name is in an if-else where the other
+                        # branch also uses it (only one branch executes)
+                        if is_in_if_branch_where_other_branch_has(
+                            node, group_name
+                        ):
+                            continue
                         num_usages += 1
                         if num_usages > 1:
                             self.add_error("B031", node, node.id)

From dbf6673b67afb1dffed86d2b6a3783462e4ca725 Mon Sep 17 00:00:00 2001
From: Wali Reheman <rw8143a@american.edu>
Date: Mon, 15 Jun 2026 09:15:14 -0400
Subject: [PATCH 2/2] fix line length

---
 bugbear.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bugbear.py b/bugbear.py
index d706540..26ffa87 100644
--- a/bugbear.py
+++ b/bugbear.py
@@ -1238,14 +1238,17 @@ def branches_contain_same_name(if_node: ast.If, name: str) -> bool:
                 def is_in_if_branch_where_other_branch_has(
                     name_node: ast.Name, name: str
                 ) -> bool:
-                    """Check if name_node is inside an if-else where the other branch also has name."""
+                    """Check if name_node is inside an if-else where
+                    the other branch also has name."""
                     current = name_node
                     while True:
                         parent = parent_map.get(current)
                         if parent is None:
                             return False
                         if isinstance(parent, ast.If) and parent.orelse:
-                            if branches_contain_same_name(parent, name):
+                            if branches_contain_same_name(
+                                parent, name
+                            ):
                                 return True
                         current = parent