fix pylint warnings in 7.0 branch