Fixing lint issues not related to gpg module but that are breaking the pylint unit test.