mypy

48ae9d52 - Remove some python2 left-overs (#13340)