Python3 pylint fixes

Sprinkle 'pylint disable' comments over the code base to silence a bunch
of pylint warnings on Python 3. All silenced warnings are harmless and
not bugs.

https://fedorahosted.org/freeipa/ticket/4985

Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Martin Basti <mbasti@redhat.com>

24 files changed, 40 insertions, 21 deletions

diff --git a/client/ipa-client-automount b/client/ipa-client-automount
index b4aa7e81b..53c05378a 100755
--- a/client/ipa-client-automount
+++ b/client/ipa-client-automount
@@ -39,7 +39,7 @@ import SSSDConfig
 from six.moves.urllib.parse import urlsplit
 # pylint: enable=import-error
 
-from optparse import OptionParser
+from optparse import OptionParser  # pylint: disable=deprecated-module
 from ipalib import api, errors
 from ipapython import sysrestore
 from ipapython import ipautil
diff --git a/install/tools/ipa-adtrust-install b/install/tools/ipa-adtrust-install
index 8b75d5c3a..dc4ff3a7f 100755
--- a/install/tools/ipa-adtrust-install
+++ b/install/tools/ipa-adtrust-install
@@ -29,7 +29,7 @@ import ldap
 
 import six
 
-from optparse import SUPPRESS_HELP
+from optparse import SUPPRESS_HELP  # pylint: disable=deprecated-module
 
 from ipaserver.install import adtrustinstance
 from ipaserver.install.installutils import (
diff --git a/install/tools/ipa-compat-manage b/install/tools/ipa-compat-manage
index 905495fd1..307af1f88 100755
--- a/install/tools/ipa-compat-manage
+++ b/install/tools/ipa-compat-manage
@@ -24,7 +24,7 @@ from __future__ import print_function
 import sys
 from ipaplatform.paths import paths
 try:
-    from optparse import OptionParser
+    from optparse import OptionParser  # pylint: disable=deprecated-module
     from ipapython import ipautil, config
     from ipaserver.install import installutils
     from ipaserver.install.ldapupdate import LDAPUpdate
diff --git a/install/tools/ipa-csreplica-manage b/install/tools/ipa-csreplica-manage
index 532e35344..a4d0a88a6 100755
--- a/install/tools/ipa-csreplica-manage
+++ b/install/tools/ipa-csreplica-manage
@@ -50,7 +50,7 @@ commands = {
 
 
 def parse_options():
-    from optparse import OptionParser
+    from optparse import OptionParser  # pylint: disable=deprecated-module
 
     parser = OptionParser(version=version.VERSION)
     parser.add_option("-H", "--host", dest="host", help="starting host")
diff --git a/install/tools/ipa-dns-install b/install/tools/ipa-dns-install
index 9c63e128e..699749d08 100755
--- a/install/tools/ipa-dns-install
+++ b/install/tools/ipa-dns-install
@@ -24,7 +24,7 @@ from __future__ import print_function
 import os
 import sys
 
-from optparse import SUPPRESS_HELP
+from optparse import SUPPRESS_HELP  # pylint: disable=deprecated-module
 
 from ipaserver.install import bindinstance
 from ipaserver.install import installutils
diff --git a/install/tools/ipa-managed-entries b/install/tools/ipa-managed-entries
index 5761020cc..59f14fcf1 100755
--- a/install/tools/ipa-managed-entries
+++ b/install/tools/ipa-managed-entries
@@ -22,7 +22,7 @@ from __future__ import print_function
 
 import re
 import sys
-from optparse import OptionParser
+from optparse import OptionParser  # pylint: disable=deprecated-module
 
 from ipapython import config
 from ipaserver.install import installutils
diff --git a/install/tools/ipa-nis-manage b/install/tools/ipa-nis-manage
index b72e273ea..fae458cbd 100755
--- a/install/tools/ipa-nis-manage
+++ b/install/tools/ipa-nis-manage
@@ -25,7 +25,7 @@ import sys
 import os
 from ipaplatform.paths import paths
 try:
-    from optparse import OptionParser
+    from optparse import OptionParser  # pylint: disable=deprecated-module
     from ipapython import ipautil, config
     from ipaserver.install import installutils
     from ipaserver.install.ldapupdate import LDAPUpdate
diff --git a/install/tools/ipa-replica-conncheck b/install/tools/ipa-replica-conncheck
index 4045e41df..7ec1ef83b 100755
--- a/install/tools/ipa-replica-conncheck
+++ b/install/tools/ipa-replica-conncheck
@@ -27,7 +27,9 @@ from ipapython import ipautil, certdb
 from ipalib import api, errors, x509
 from ipaserver.install import installutils
 import ipaclient.ipachangeconf
+# pylint: disable=deprecated-module
 from optparse import OptionGroup, OptionValueError
+# pylint: enable=deprecated-module
 from ipapython.ipa_log_manager import root_logger, standard_logging_setup
 import sys
 import os
diff --git a/ipaclient/ipa_certupdate.py b/ipaclient/ipa_certupdate.py
index 6bf9831ee..6e41de929 100644
--- a/ipaclient/ipa_certupdate.py
+++ b/ipaclient/ipa_certupdate.py
@@ -99,7 +99,9 @@ class CertUpdate(admintool.AdminTool):
         if server_fstore.has_files():
             self.update_server(certs)
             try:
+                # pylint: disable=import-error
                 from ipaserver.install import cainstance
+                # pylint: enable=import-error
                 cainstance.add_lightweight_ca_tracking_requests(
                     self.log, lwcas)
             except Exception:
diff --git a/ipalib/cli.py b/ipalib/cli.py
index ad876ea43..696be622f 100644
--- a/ipalib/cli.py
+++ b/ipalib/cli.py
@@ -27,7 +27,7 @@ import textwrap
 import sys
 import getpass
 import code
-import optparse
+import optparse  # pylint: disable=deprecated-module
 import fcntl
 import termios
 import struct
@@ -41,8 +41,8 @@ if six.PY3:
     unicode = str
 
 if six.PY2:
-    reload(sys)                         # pylint: disable=reload-builtin
-    sys.setdefaultencoding('utf-8')     # pylint: disable=no-member
+    reload(sys)  # pylint: disable=reload-builtin, undefined-variable
+    sys.setdefaultencoding('utf-8')  # pylint: disable=no-member
 
 from ipalib import frontend
 from ipalib import backend
diff --git a/ipalib/plugable.py b/ipalib/plugable.py
index 3fdedf03a..503534f9f 100644
--- a/ipalib/plugable.py
+++ b/ipalib/plugable.py
@@ -29,7 +29,7 @@ import sys
 import threading
 import os
 from os import path
-import optparse
+import optparse  # pylint: disable=deprecated-module
 import textwrap
 import collections
 import importlib
diff --git a/ipalib/rpc.py b/ipalib/rpc.py
index 7756eafe5..bd1325124 100644
--- a/ipalib/rpc.py
+++ b/ipalib/rpc.py
@@ -623,7 +623,9 @@ class KerbTransport(SSLTransport):
 
             while True:
                 if six.PY2:
+                    # pylint: disable=no-value-for-parameter
                     self.send_request(h, handler, request_body)
+                    # pylint: enable=no-value-for-parameter
                     self.send_host(h, host)
                     self.send_user_agent(h)
                     self.send_content(h, request_body)
diff --git a/ipalib/text.py b/ipalib/text.py
index 34e5f1a89..f4f810c28 100644
--- a/ipalib/text.py
+++ b/ipalib/text.py
@@ -254,7 +254,7 @@ class Gettext(LazyText):
         else:
             t = create_translation(self.key)
         if six.PY2:
-            return t.ugettext(self.msg)
+            return t.ugettext(self.msg)  # pylint: disable=no-member
         else:
             return t.gettext(self.msg)
 
@@ -409,7 +409,9 @@ class NGettext(LazyText):
         else:
             t = create_translation(self.key)
         if six.PY2:
+            # pylint: disable=no-member
             return t.ungettext(self.singular, self.plural, count)
+            # pylint: enable=no-member
         else:
             return t.ngettext(self.singular, self.plural, count)
 
diff --git a/ipapython/admintool.py b/ipapython/admintool.py
index ec0e7e079..78bbcec75 100644
--- a/ipapython/admintool.py
+++ b/ipapython/admintool.py
@@ -25,7 +25,7 @@ Handles common operations like option parsing and logging
 import sys
 import os
 import traceback
-from optparse import OptionGroup
+from optparse import OptionGroup  # pylint: disable=deprecated-module
 
 from ipapython import version
 from ipapython import config
diff --git a/ipapython/config.py b/ipapython/config.py
index 8e5708e6a..f71c696f9 100644
--- a/ipapython/config.py
+++ b/ipapython/config.py
@@ -17,7 +17,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from optparse import Option, Values, OptionParser, IndentedHelpFormatter, OptionValueError
+# pylint: disable=deprecated-module
+from optparse import (
+    Option, Values, OptionParser, IndentedHelpFormatter, OptionValueError)
+# pylint: enable=deprecated-module
 from copy import copy
 
 from dns import resolver, rdatatype
diff --git a/ipapython/install/cli.py b/ipapython/install/cli.py
index 7fbb7259e..b6f872ed9 100644
--- a/ipapython/install/cli.py
+++ b/ipapython/install/cli.py
@@ -9,7 +9,7 @@ Command line support.
 import collections
 import enum
 import functools
-import optparse
+import optparse  # pylint: disable=deprecated-module
 import signal
 
 import six
diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py
index 7d3429493..472ba3596 100644
--- a/ipapython/ipautil.py
+++ b/ipapython/ipautil.py
@@ -690,7 +690,9 @@ class CIDict(dict):
 
     if six.PY2:
         def has_key(self, key):
+            # pylint: disable=no-member
             return super(CIDict, self).has_key(key.lower())
+            # pylint: enable=no-member
 
     def get(self, key, failobj=None):
         try:
diff --git a/ipaserver/install/certs.py b/ipaserver/install/certs.py
index 852bcec82..75a041214 100644
--- a/ipaserver/install/certs.py
+++ b/ipaserver/install/certs.py
@@ -30,6 +30,7 @@ import fcntl
 import time
 import datetime
 
+import six
 from six.moves import configparser
 
 from ipapython.ipa_log_manager import root_logger
@@ -720,7 +721,10 @@ class _CrossProcessLock(object):
 
     def _read(self, fileobj):
         p = configparser.RawConfigParser()
-        p.readfp(fileobj)
+        if six.PY2:
+            p.readfp(fileobj)  # pylint: disable=deprecated-method
+        else:
+            p.read_file(fileobj)  # pylint: disable=no-member
 
         try:
             self._locked = p.getboolean('lock', 'locked')
diff --git a/ipaserver/install/ipa_cacert_manage.py b/ipaserver/install/ipa_cacert_manage.py
index 0dcb70fea..9a09b2a27 100644
--- a/ipaserver/install/ipa_cacert_manage.py
+++ b/ipaserver/install/ipa_cacert_manage.py
@@ -20,7 +20,7 @@
 from __future__ import print_function
 
 import os
-from optparse import OptionGroup
+from optparse import OptionGroup  # pylint: disable=deprecated-module
 from cryptography.hazmat.primitives import serialization
 import gssapi
 
diff --git a/ipaserver/install/ipa_replica_prepare.py b/ipaserver/install/ipa_replica_prepare.py
index dd75eb116..069110fff 100644
--- a/ipaserver/install/ipa_replica_prepare.py
+++ b/ipaserver/install/ipa_replica_prepare.py
@@ -25,7 +25,9 @@ import os
 import shutil
 import tempfile
 import time
+# pylint: disable=deprecated-module
 from optparse import OptionGroup, SUPPRESS_HELP
+# pylint: enable=deprecated-module
 
 import dns.resolver
 # pylint: disable=import-error
diff --git a/ipaserver/install/ipa_server_certinstall.py b/ipaserver/install/ipa_server_certinstall.py
index 3c30876da..9cb7ed1d6 100644
--- a/ipaserver/install/ipa_server_certinstall.py
+++ b/ipaserver/install/ipa_server_certinstall.py
@@ -21,7 +21,7 @@
 import os
 import os.path
 import pwd
-import optparse
+import optparse  # pylint: disable=deprecated-module
 
 from ipaplatform.constants import constants
 from ipaplatform.paths import paths
diff --git a/ipatests/i18n.py b/ipatests/i18n.py
index 8c6e641fd..aa8932dd6 100755
--- a/ipatests/i18n.py
+++ b/ipatests/i18n.py
@@ -23,7 +23,7 @@ from __future__ import print_function
 
 # WARNING: Do not import ipa modules, this is also used as a
 # stand-alone script (invoked from po Makefile).
-import optparse
+import optparse  # pylint: disable=deprecated-module
 import sys
 import gettext
 import re
diff --git a/lite-server.py b/lite-server.py
index 0e867915f..cd4f09cbb 100755
--- a/lite-server.py
+++ b/lite-server.py
@@ -32,7 +32,7 @@ Unfortunately, SSL support is broken under Python 2.6 with paste 1.7.2, see:
 """
 
 from os import path, getcwd
-import optparse
+import optparse  # pylint: disable=deprecated-module
 from paste import httpserver
 import paste.gzipper
 from paste.urlmap import URLMap
diff --git a/makeapi b/makeapi
index a02a491a4..d0a72954b 100755
--- a/makeapi
+++ b/makeapi
@@ -86,7 +86,7 @@ OUTPUT_IGNORED_ATTRIBUTES = (
 )
 
 def parse_options():
-    from optparse import OptionParser
+    from optparse import OptionParser  # pylint: disable=deprecated-module
 
     parser = OptionParser()
     parser.add_option("--validate", dest="validate", action="store_true",