I added the changes for PyLint according to dev4 on master with a version difference for Python2 vs Python3.