fixup! [#8415] py2 removal - removal of six.PY2 checks
6 files changed