Merge pull request #373 from ed-velez/pylint_fixes

Pylint Fixes

.pylintrc

@@ -215,8 +215,8 @@ min-public-methods=1
 [EXCEPTIONS]
 
 # Exceptions that will emit a warning when caught.
-overgeneral-exceptions=BaseException,
-                       Exception
+overgeneral-exceptions=builtins.BaseException,
+                       builtins.Exception
 
 
 [FORMAT]

Jenkinsfile

@@ -12,7 +12,7 @@ pipeline {
         sh '''apt-get update
 apt-get install -y python3-pip python3-psycopg2 rsync
 pip3 install configobj
-pip3 install pylint
+pip3 install 'pylint>=2.17.0,<3.0.0'
 pip3 install six
 python3 --version'''
       }

contrib/holland-commvault/holland_commvault/commvault.py

@@ -156,8 +156,7 @@ def main():
         except IOError:
             logging.info("Holland (commvault agent) failed to open/read status file")
             return 1
-        else:
-            status.close()
+        status.close()
         return ret
     except IOError as ex:
         logging.warning("Holland (commvault agent) IOError: %r", ex)

holland/core/util/lock.py

@@ -31,8 +31,7 @@ def acquire(self):
         except IOError as exc:
             self.lock = None
             raise LockError(str(exc), exc)
-        else:
-            return True
+        return True
 
     def is_locked(self):
         """Check for lock"""
@@ -48,5 +47,4 @@ def release(self):
             self.lock = None
         except IOError as exc:
             raise LockError(str(exc), exc)
-        else:
-            return True
+        return True

plugins/holland.lib.mysql/holland/lib/mysql/option/base.py

@@ -2,6 +2,7 @@
 
 http://dev.mysql.com/doc/refman/5.1/en/option-files.html
 """
+
 import codecs
 import logging
 import os
@@ -13,7 +14,7 @@
 
 def merge_options(*defaults_files):
     """Merge multiple defaults files together"""
-    defaults_config = dict(client={})
+    defaults_config = {"client": {}}
 
     def merge(dst_dict, src_dict):
         """Merge two dictionaries non-destructively"""