Skip to content
Snippets Groups Projects
Commit f3762eafed66 authored by Matt Harbison's avatar Matt Harbison
Browse files

typing: add some type annotations to the `merge.mergeresult` class

The generated type annotations around `filemap()` and `files()` were slightly
modified by the pyupgrade series culminating in 70a75d379daf.  This module is
way more complicated than the other changes, but these weren't too bad to figure
out.

The typing caught a trivial issue in `sparse`- it was passing an empty data list
to `addfile()` for the `ACTION_REMOVE` case, instead of a tuple or None.
`merge.manifestmerge()` calls this function with None for the data, so 1) it has
to be typed as optional, and 2) is safe to pass None in the sparse code.
parent 10e7adbffa8c
No related branches found
No related tags found
2 merge requests!1292Draft: 7.0rc preparation,!1209Type annotations around the pyupgrade changes
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment