Merge in 2 code changes from psf/black (#5)

* Fix new mypy error in blib2to3 (psf#3674)

See python/mypy#15174

* blib2to3: add a few annotations (psf#3675)

---------

Co-authored-by: Jelle Zijlstra <[email protected]>

Author: jsh9