[8.0] Fix pep8 to pass super checks