Make lint work on Fedora 22.

pylint added 'confidence' parameter to 'add_message' method of PyLinter.
To be compatible with both, pre- and post- 1.4  IPALinter must accept
the parameter but not pass it over.
Also python3 checker was added and enabled by default. FreeIPA is still
not ready for python3.
Additionally few false-positives was marked.

Reviewed-By: Martin Basti <mbasti@redhat.com>

4 files changed, 5 insertions, 1 deletions

diff --git a/ipalib/plugins/otptoken.py b/ipalib/plugins/otptoken.py
index b87145df8..867659ec2 100644
--- a/ipalib/plugins/otptoken.py
+++ b/ipalib/plugins/otptoken.py
@@ -547,6 +547,7 @@ class otptoken_sync(Local):
         query = urllib.urlencode(query)
 
         # Sync the token.
+        # pylint: disable=E1101
         handler = HTTPSHandler(ca_certs=os.path.join(self.api.env.confdir, 'ca.crt'),
                                cert_reqs=ssl.CERT_REQUIRED,
                                ssl_version=ssl.PROTOCOL_TLSv1)
diff --git a/ipapython/dnssec/ldapkeydb.py b/ipapython/dnssec/ldapkeydb.py
index 71c0a95a3..520b51070 100644
--- a/ipapython/dnssec/ldapkeydb.py
+++ b/ipapython/dnssec/ldapkeydb.py
@@ -23,6 +23,7 @@ def uri_escape(val):
     assert len(val) > 0, "zero-length URI component detected"
     hexval = hexlify(val)
     out = '%'
+    # pylint: disable=E1127
     out += '%'.join(hexval[i:i+2] for i in range(0, len(hexval), 2))
     return out
 
diff --git a/ipaserver/install/ipa_otptoken_import.py b/ipaserver/install/ipa_otptoken_import.py
index b78aba93a..c6a69c997 100644
--- a/ipaserver/install/ipa_otptoken_import.py
+++ b/ipaserver/install/ipa_otptoken_import.py
@@ -60,6 +60,7 @@ def convertDate(value):
 
     dt = dateutil.parser.parse(value)
 
+    # pylint: disable=E1101
     if dt.tzinfo is None:
         dt = datetime.datetime(*dt.timetuple()[0:6],
                                tzinfo=dateutil.tz.tzlocal())
diff --git a/make-lint b/make-lint
index 2dce0d147..db68121b3 100755
--- a/make-lint
+++ b/make-lint
@@ -152,7 +152,7 @@ class IPALinter(PyLinter):
             return
         super(IPALinter, self).register_checker(checker)
 
-    def add_message(self, msg_id, line=None, node=None, args=None):
+    def add_message(self, msg_id, line=None, node=None, args=None, confidence=None):
         if line is None and node is not None:
             line = node.fromlineno
 
@@ -244,6 +244,7 @@ def main():
                         '{path}:{line}: [{msg_id}({symbol}), {obj}] {msg})')
     linter.set_option('reports', False)
     linter.set_option('persistent', False)
+    linter.set_option('disable', 'python3')
 
     linter.check(files)