Merge pull request #3672 from jenshnielsen/pep8_fixes

PEP8 : Python3 pep8 fixes
Merge remote-tracking branch 'jenshnielsen/fix_3669'