Please pylint

My patch #18221 yesterday introduced new Pylint warnings/errors.

This fixes these warnings.