Skip to content

Commit 97d9b65

Browse files
committed
Apply intended suppression in Tree.traverse
The superclass _traverse method call in Tree.traverse appears to have once had a working suppression for the incompatbile types of two arguments, `predicate` and `prune`, as well as for an argument that required (and requires) no suppression, `depth`. These three arguments were written on the same line, which bad a `type: ignore` comment on it. But when black formatting was applied in 21ec529 (gitpython-developers#1442), that comment moved so that it was on a line with just the `depth` call that didn't need it, rather than the others that did. Since then, mypy has reported errors, which further seem intended to suppress based on the surrounding context and the use of `cast` to deal with the static type incompatibilities going the other way. This misplaced suppression was one of the ones I very recently removed in 84fc806. But really there should be a suppression for those arguments (at least for now, while the code remains written that way, given that a suppression is intended). This suppresses the error effectively by inserting two suppression comments, one for each of the two arguments. This is more specific than a single suppression applying to the whole call, and keeping the arguments on separate lines both makes black happy and makes clear that it is not by coincidence that the error is suppressed for both of them. The new suppressions are also written for the specific mypy error at issue, rather than fully general as before. This change decreases the number of mypy errors by two.
1 parent 96ecc2e commit 97d9b65

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

git/objects/tree.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,8 @@ def traverse(
329329
return cast(
330330
Union[Iterator[IndexObjUnion], Iterator[TraversedTreeTup]],
331331
super()._traverse(
332-
predicate,
333-
prune,
332+
predicate, # type: ignore[arg-type]
333+
prune, # type: ignore[arg-type]
334334
depth,
335335
branch_first,
336336
visit_once,

0 commit comments

Comments
 (0)