fix pylint warnings

rename local variable and arguments shadowing other identifiers
Merge pull request #61 from gurneyalex/8.0-fix-pylint

fix pylint warnings