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

typing: lock in the type annotations that were lost with the pyupgrade changes

For some reason, these reverted from a specific type to something less useful
after the changes that culminated in 70a75d379daf.  (e.g. the `remotefilectx`
method went from `Generator[remotefilectx, Any, None]` to
`Generator[nothing, Any, None]`.)  The previous typing for `merge.filemap` was
`Generator[Tuple[Any, Tuple[Any, Any, Any]], Any, None]`, and decayed to
`Generator[nothing, Any, None]`.  I don't feel like unravelling the specific
types here, so restore the equivalent of that.
parent 279e217d6041
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