4 files changed, 5 insertions, 5 deletions
diff --git a/base/server/python/pki/server/__init__.py b/base/server/python/pki/server/__init__.py
index 70734c3db..357bad3c3 100644
--- a/base/server/python/pki/server/__init__.py
+++ b/base/server/python/pki/server/__init__.py
@@ -469,7 +469,7 @@ class ExternalCert(object):
 @functools.total_ordering
 class PKIInstance(object):
 
-    def __init__(self, name, instanceType=10):  # nopep8
+    def __init__(self, name, instanceType=10):  # noqa: N803
 
         self.name = name
         self.type = instanceType
diff --git a/base/server/python/pki/server/cli/kra.py b/base/server/python/pki/server/cli/kra.py
index 5c9111d5b..5558d6a00 100644
--- a/base/server/python/pki/server/cli/kra.py
+++ b/base/server/python/pki/server/cli/kra.py
@@ -378,7 +378,7 @@ class KRADBVLVAddCLI(pki.cli.CLI):
             print('KRA VLVs added to the database for ' + instance_name)
 
         except ldap.LDAPError as e:
-            print("ERROR: " + e.message['desc'])
+            print("ERROR: {}".format(e))
             sys.exit(1)
 
     def add_vlv(self, subsystem, bind_dn, bind_password):
diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py
index 15e48baf0..e05e0be31 100644
--- a/base/server/python/pki/server/deployment/pkiparser.py
+++ b/base/server/python/pki/server/deployment/pkiparser.py
@@ -308,7 +308,7 @@ class PKIConfigParser:
 
         return value
 
-    def read_password(self, message, section=None, key=None,  # nopep8
+    def read_password(self, message, section=None, key=None,  # noqa: N803
                       verifyMessage=None):
         message = ' ' * self.indent + message + ': '
         if verifyMessage is not None:  # nopep8
diff --git a/base/server/python/pki/server/upgrade.py b/base/server/python/pki/server/upgrade.py
index 116ef3dda..2c72e4864 100644
--- a/base/server/python/pki/server/upgrade.py
+++ b/base/server/python/pki/server/upgrade.py
@@ -155,8 +155,8 @@ class PKIServerUpgradeScriptlet(pki.upgrade.PKIUpgradeScriptlet):
 
 class PKIServerUpgrader(pki.upgrade.PKIUpgrader):
 
-    def __init__(self, instanceName=None, instanceType=None,  # nopep8
-                 subsystemName=None, upgrade_dir=UPGRADE_DIR,  # nopep8
+    def __init__(self, instanceName=None, instanceType=None,  # noqa: N803
+                 subsystemName=None, upgrade_dir=UPGRADE_DIR,  # noqa: N803
                  version=None, index=None, silent=False):
         super(PKIServerUpgrader, self).__init__(
             upgrade_dir, version, index, silent)