Fix flake8 / PEP 8 violations

https://fedorahosted.org/pki/ticket/1738

6 files changed, 34 insertions, 32 deletions

diff --git a/base/server/python/pki/server/__init__.py b/base/server/python/pki/server/__init__.py
index 604a56e7a..cb246aaa1 100644
--- a/base/server/python/pki/server/__init__.py
+++ b/base/server/python/pki/server/__init__.py
@@ -467,7 +467,7 @@ class PKIServerException(pki.PKIException):
 class Tomcat(object):
 
     @classmethod
-    def get_major_version(self):
+    def get_major_version(cls):
 
         # run "tomcat version"
         output = subprocess.check_output(['/usr/sbin/tomcat', 'version'])
diff --git a/base/server/python/pki/server/cli/nuxwdog.py b/base/server/python/pki/server/cli/nuxwdog.py
index ca9c7c39b..afbd438ff 100644
--- a/base/server/python/pki/server/cli/nuxwdog.py
+++ b/base/server/python/pki/server/cli/nuxwdog.py
@@ -222,8 +222,7 @@ class NuxwdogEnableCLI(pki.cli.CLI):
             '/etc/systemd/system/pki-tomcatd.target.wants',
             old_systemd_unit_file)
 
-        new_systemd_unit_file = ('pki-tomcatd-nuxwdog@' + instance.name
-                                 + '.service')
+        new_systemd_unit_file = 'pki-tomcatd-nuxwdog@%s.service' % instance.name
         new_systemd_link = os.path.join(
             '/etc/systemd/system/pki-tomcatd-nuxwdog.target.wants',
             new_systemd_unit_file)
@@ -373,8 +372,7 @@ class NuxwdogDisableCLI(pki.cli.CLI):
         os.chown(filename, instance.uid, instance.gid)
 
     def change_systemd_links(self, instance):
-        old_systemd_unit_file = ('pki-tomcatd-nuxwdog@' + instance.name
-                                 + '.service')
+        old_systemd_unit_file = 'pki-tomcatd-nuxwdog@%s.service' % instance.name
         old_systemd_link = os.path.join(
             '/etc/systemd/system/pki-tomcatd-nuxwdog.target.wants',
             old_systemd_unit_file)
diff --git a/base/server/python/pki/server/cli/subsystem.py b/base/server/python/pki/server/cli/subsystem.py
index 1be91b10e..f0e38b65e 100644
--- a/base/server/python/pki/server/cli/subsystem.py
+++ b/base/server/python/pki/server/cli/subsystem.py
@@ -448,7 +448,7 @@ class SubsystemCertExportCLI(pki.cli.CLI):
         super(SubsystemCertExportCLI, self).__init__(
             'export', 'Export subsystem certificate')
 
-    def usage(self):
+    def usage(self):  # flake8: noqa
         print('Usage: pki-server subsystem-cert-export [OPTIONS] <subsystem ID> <cert ID>')
         print()
         print('  -i, --instance <instance ID>       Instance ID (default: pki-tomcat).')
diff --git a/base/server/python/pki/server/deployment/pkihelper.py b/base/server/python/pki/server/deployment/pkihelper.py
index c5c71ef99..0f5485a46 100644
--- a/base/server/python/pki/server/deployment/pkihelper.py
+++ b/base/server/python/pki/server/deployment/pkihelper.py
@@ -43,8 +43,18 @@ from pwd import getpwuid
 import xml.etree.ElementTree as ET
 from lxml import etree
 import zipfile
-import selinux
 
+# PKI Deployment Imports
+from . import pkiconfig as config
+from .pkiconfig import pki_selinux_config_ports as ports
+from . import pkimanifest as manifest
+from . import pkimessages as log
+from .pkiparser import PKIConfigParser
+import pki.client
+import pki.system
+
+# special care for SELinux
+import selinux
 seobject = None
 if selinux.is_selinux_enabled():
     try:
@@ -56,16 +66,6 @@ if selinux.is_selinux_enabled():
             raise
 
 
-# PKI Deployment Imports
-from . import pkiconfig as config
-from .pkiconfig import pki_selinux_config_ports as ports
-from . import pkimanifest as manifest
-from . import pkimessages as log
-from .pkiparser import PKIConfigParser
-import pki.client
-import pki.system
-
-
 # PKI Deployment Helper Functions
 def pki_copytree(src, dst, symlinks=False, ignore=None):
     """Recursively copy a directory tree using copy2().
@@ -3908,8 +3908,8 @@ class ConfigClient:
                     message = root.findall('.//Message')[0].text
                     if message is not None:
                         config.pki_log.error(
-                            log.PKI_CONFIG_JAVA_CONFIGURATION_EXCEPTION + " "
-                            + message,
+                            log.PKI_CONFIG_JAVA_CONFIGURATION_EXCEPTION + " " +
+                            message,
                             extra=config.PKI_INDENTATION_LEVEL_2)
 
             raise
@@ -4125,7 +4125,8 @@ class ConfigClient:
                         cert1.req_ext_data = \
                             self.mdict['pki_req_ext_data']
 
-                if self.external and self.external_step_two: # external/existing CA step 2
+                if self.external and self.external_step_two:
+                    # external/existing CA step 2
 
                     # If specified, load the externally-signed CA cert
                     if self.mdict['pki_external_ca_cert_path']:
@@ -4143,7 +4144,8 @@ class ConfigClient:
 
                     systemCerts.append(cert1)
 
-                elif self.standalone and self.external_step_two: # standalone KRA/OCSP step 2
+                elif self.standalone and self.external_step_two:
+                    # standalone KRA/OCSP step 2
 
                     cert1 = pki.system.SystemCertData()
                     cert1.tag = self.mdict['pki_ca_signing_tag']
diff --git a/base/server/python/pki/server/deployment/scriptlets/configuration.py b/base/server/python/pki/server/deployment/scriptlets/configuration.py
index 5ec46c86f..7ecb4d76f 100644
--- a/base/server/python/pki/server/deployment/scriptlets/configuration.py
+++ b/base/server/python/pki/server/deployment/scriptlets/configuration.py
@@ -99,7 +99,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
         external_csr_path = deployer.configuration_file.external_csr_path
 
         try:
-            if external and step_one: # external/existing CA step 1
+            if external and step_one:  # external/existing CA step 1
 
                 key_type = deployer.mdict['pki_ca_signing_key_type']
                 key_alg = deployer.mdict['pki_ca_signing_key_algorithm']
@@ -147,7 +147,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
 
                 subsystem.save()
 
-            elif external and step_two: # external/existing CA step 2
+            elif external and step_two:  # external/existing CA step 2
 
                 # If specified, import existing CA cert request into CS.cfg.
                 if external_csr_path:
@@ -157,7 +157,8 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
                     subsystem.config['ca.signing.certreq'] = signing_csr
 
                 # If specified, import external CA cert into NSS database.
-                external_ca_cert_chain_nickname = deployer.mdict['pki_external_ca_cert_chain_nickname']
+                external_ca_cert_chain_nickname = \
+                    deployer.mdict['pki_external_ca_cert_chain_nickname']
                 external_ca_cert_chain_file = deployer.mdict['pki_external_ca_cert_chain_path']
                 if external_ca_cert_chain_file:
                     cert_chain = nssdb.import_cert_chain(
@@ -189,11 +190,12 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
                 subsystem.config['ca.signing.tokenname'] = deployer.mdict['pki_ca_signing_token']
                 subsystem.config['ca.signing.cert'] = signing_cert_data
                 subsystem.config['ca.signing.cacertnickname'] = signing_nickname
-                subsystem.config['ca.signing.defaultSigningAlgorithm'] = deployer.mdict['pki_ca_signing_signing_algorithm']
+                subsystem.config['ca.signing.defaultSigningAlgorithm'] = \
+                    deployer.mdict['pki_ca_signing_signing_algorithm']
 
                 subsystem.save()
 
-            else: # self-signed CA
+            else:  # self-signed CA
 
                 # To be implemented in ticket #1692.
 
diff --git a/base/server/python/pki/server/deployment/scriptlets/selinux_setup.py b/base/server/python/pki/server/deployment/scriptlets/selinux_setup.py
index cff6acf31..c559370a5 100644
--- a/base/server/python/pki/server/deployment/scriptlets/selinux_setup.py
+++ b/base/server/python/pki/server/deployment/scriptlets/selinux_setup.py
@@ -23,6 +23,12 @@ import selinux
 import sys
 import time
 
+# PKI Deployment Imports
+from .. import pkiconfig as config
+from ..pkiconfig import pki_selinux_config_ports as ports
+from .. import pkimessages as log
+from .. import pkiscriptlet
+
 seobject = None
 if selinux.is_selinux_enabled():
     try:
@@ -33,12 +39,6 @@ if selinux.is_selinux_enabled():
         if sys.version_info.major == 2:
             raise
 
-# PKI Deployment Imports
-from .. import pkiconfig as config
-from ..pkiconfig import pki_selinux_config_ports as ports
-from .. import pkimessages as log
-from .. import pkiscriptlet
-
 
 # PKI Deployment Selinux Setup Scriptlet
 class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):