fix pylint warnings in 7.0 branch
Merge pull request #16 from gurneyalex/7.0-fix-pylint

fix pylint warnings in 7.0 branch