Fix issues reported by pylint.

Fixed all warnings caused due to absolute import of modules in same
package and not marking the regexes with an r when trying to match.

Ticket #316

16 files changed, 55 insertions, 54 deletions

diff --git a/base/common/python/pki/__init__.py b/base/common/python/pki/__init__.py
index 979bf64d9..bbcffb8a4 100644
--- a/base/common/python/pki/__init__.py
+++ b/base/common/python/pki/__init__.py
@@ -75,7 +75,7 @@ def implementation_version():
             line = line.strip('\n')
 
             # parse <key>: <value>
-            match = re.match('^\s*(\S*)\s*:\s*(.*)\s*$', line)
+            match = re.match(r'^\s*(\S*)\s*:\s*(.*)\s*$', line)
 
             if not match:
                 continue
@@ -147,7 +147,7 @@ class PropertyFile(object):
         for i, line in enumerate(self.lines):
 
             # parse <key> <delimiter> <value>
-            match = re.match('^\s*(\S*)\s*%s\s*(.*)\s*$' % self.delimiter, line)
+            match = re.match(r'^\s*(\S*)\s*%s\s*(.*)\s*$' % self.delimiter, line)
 
             if not match:
                 continue
@@ -166,7 +166,7 @@ class PropertyFile(object):
         for line in self.lines:
 
             # parse <key> <delimiter> <value>
-            match = re.match('^\s*(\S*)\s*%s\s*(.*)\s*$' % self.delimiter, line)
+            match = re.match(r'^\s*(\S*)\s*%s\s*(.*)\s*$' % self.delimiter, line)
 
             if not match:
                 continue
@@ -184,7 +184,7 @@ class PropertyFile(object):
         for i, line in enumerate(self.lines):
 
             # parse <key> <delimiter> <value>
-            match = re.match('^\s*(\S*)\s*%s\s*(.*)\s*$' % self.delimiter, line)
+            match = re.match(r'^\s*(\S*)\s*%s\s*(.*)\s*$' % self.delimiter, line)
 
             if not match:
                 continue
@@ -206,7 +206,7 @@ class PropertyFile(object):
         for i, line in enumerate(self.lines):
 
             # parse <key> <delimiter> <value>
-            match = re.match('^\s*(\S*)\s*%s\s*(.*)\s*$' % self.delimiter, line)
+            match = re.match(r'^\s*(\S*)\s*%s\s*(.*)\s*$' % self.delimiter, line)
 
             if not match:
                 continue
diff --git a/base/common/python/pki/upgrade.py b/base/common/python/pki/upgrade.py
index d1cda6bac..05db24f63 100644
--- a/base/common/python/pki/upgrade.py
+++ b/base/common/python/pki/upgrade.py
@@ -55,7 +55,7 @@ class Version(object):
                 raise Exception('Invalid version number: ' + obj)
 
             # parse <major>.<minor>.<patch>
-            match = re.match('^(\d+)\.(\d+)\.(\d+)$', self.version)
+            match = re.match(r'^(\d+)\.(\d+)\.(\d+)$', self.version)
 
             if match is None:
                 raise Exception('Invalid version number: ' + self.version)
diff --git a/base/server/src/engine/pkihelper.py b/base/server/src/engine/pkihelper.py
index c33abe0f8..39a0b8b9e 100644
--- a/base/server/src/engine/pkihelper.py
+++ b/base/server/src/engine/pkihelper.py
@@ -47,11 +47,11 @@ if selinux.is_selinux_enabled():
 
 
 # PKI Deployment Imports
-import pkiconfig as config
-from pkiconfig import pki_selinux_config_ports as ports
-import pkimanifest as manifest
-import pkimessages as log
-from pkiparser import PKIConfigParser
+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.account
 import pki.client
 import pki.system
diff --git a/base/server/src/engine/pkimanifest.py b/base/server/src/engine/pkimanifest.py
index 721373eac..09079b433 100644
--- a/base/server/src/engine/pkimanifest.py
+++ b/base/server/src/engine/pkimanifest.py
@@ -23,8 +23,8 @@
 import csv
 
 # PKI Deployment Imports
-import pkiconfig as config
-import pkimessages as log
+from . import pkiconfig as config
+from . import pkimessages as log
 
 
 # PKI Deployment Manifest Constants
diff --git a/base/server/src/engine/pkimessages.py b/base/server/src/engine/pkimessages.py
index 5ee8bb840..fdbd28312 100644
--- a/base/server/src/engine/pkimessages.py
+++ b/base/server/src/engine/pkimessages.py
@@ -307,10 +307,10 @@ PKI_CONFIG_RESPONSE_ADMIN_CERT = "adminCert:"
 PKI_CONFIG_RESPONSE_STATUS = "status:"
 PKI_CONFIG_NOT_YET_IMPLEMENTED_1 = " %s NOT YET IMPLEMENTED"
 PKI_CHECK_STATUS_MESSAGE = "    To check the status of the subsystem: \n"\
-"        systemctl status pki-tomcatd\@%s.service"
+"        systemctl status pki-tomcatd@%s.service"
 PKI_ACCESS_URL = "    The URL for the subsystem is https://%s:%s/%s"
 PKI_INSTANCE_RESTART_MESSAGE = "    To restart the subsystem: \n"\
-"        systemctl restart pki-tomcatd\@%s.service"
+"        systemctl restart pki-tomcatd@%s.service"
 
 
 PKI_SPAWN_INFORMATION_HEADER = "\n    ==========================================================================\n"\
diff --git a/base/server/src/engine/pkiparser.py b/base/server/src/engine/pkiparser.py
index a70a8df6e..00d9f7322 100644
--- a/base/server/src/engine/pkiparser.py
+++ b/base/server/src/engine/pkiparser.py
@@ -34,13 +34,13 @@ import subprocess
 # PKI Imports
 import pki
 import pki.upgrade
-import pkilogging
-import pkiconfig as config
-import pkimessages as log
-
 import pki.account
 import pki.client
 import pki.system
+from . import pkiconfig as config
+from . import pkimessages as log
+from . import pkilogging
+
 
 class PKIConfigParser:
 
diff --git a/base/server/src/scriptlets/configuration.py b/base/server/src/scriptlets/configuration.py
index b2223cab7..d32437f0b 100644
--- a/base/server/src/scriptlets/configuration.py
+++ b/base/server/src/scriptlets/configuration.py
@@ -19,11 +19,12 @@
 # All rights reserved.
 #
 
-# PKI Deployment Imports
-import pkiconfig as config
-import pkimessages as log
-import pkiscriptlet
 import json
+
+# PKI Deployment Imports
+from . import pkiconfig as config
+from . import pkimessages as log
+from . import pkiscriptlet
 import pki.system
 import pki.encoder
 
diff --git a/base/server/src/scriptlets/finalization.py b/base/server/src/scriptlets/finalization.py
index 529f9d45d..0d937584a 100644
--- a/base/server/src/scriptlets/finalization.py
+++ b/base/server/src/scriptlets/finalization.py
@@ -20,10 +20,10 @@
 #
 
 # PKI Deployment Imports
-import pkiconfig as config
-import pkimanifest as manifest
-import pkimessages as log
-import pkiscriptlet
+from . import pkiconfig as config
+from . import pkimanifest as manifest
+from . import pkimessages as log
+from . import pkiscriptlet
 
 
 # PKI Deployment Finalization Scriptlet
diff --git a/base/server/src/scriptlets/infrastructure_layout.py b/base/server/src/scriptlets/infrastructure_layout.py
index 3becd34c3..e4d32bb0b 100644
--- a/base/server/src/scriptlets/infrastructure_layout.py
+++ b/base/server/src/scriptlets/infrastructure_layout.py
@@ -20,9 +20,9 @@
 #
 
 # PKI Deployment Imports
-import pkiconfig as config
-import pkimessages as log
-import pkiscriptlet
+from . import pkiconfig as config
+from . import pkimessages as log
+from . import pkiscriptlet
 
 
 # PKI Deployment Top-Level Infrastructure Layout Scriptlet
diff --git a/base/server/src/scriptlets/initialization.py b/base/server/src/scriptlets/initialization.py
index 41e575202..55b984693 100644
--- a/base/server/src/scriptlets/initialization.py
+++ b/base/server/src/scriptlets/initialization.py
@@ -20,9 +20,9 @@
 #
 
 # PKI Deployment Imports
-import pkiconfig as config
-import pkimessages as log
-import pkiscriptlet
+from . import pkiconfig as config
+from . import pkimessages as log
+from . import pkiscriptlet
 
 
 # PKI Deployment Initialization Scriptlet
diff --git a/base/server/src/scriptlets/instance_layout.py b/base/server/src/scriptlets/instance_layout.py
index 99a97532b..fe02a9f9d 100644
--- a/base/server/src/scriptlets/instance_layout.py
+++ b/base/server/src/scriptlets/instance_layout.py
@@ -24,9 +24,9 @@ import os
 
 
 # PKI Deployment Imports
-import pkiconfig as config
-import pkimessages as log
-import pkiscriptlet
+from . import pkiconfig as config
+from . import pkimessages as log
+from . import pkiscriptlet
 
 
 # PKI Deployment Instance Layout Scriptlet
diff --git a/base/server/src/scriptlets/security_databases.py b/base/server/src/scriptlets/security_databases.py
index d8a6eeb65..aa522ce04 100644
--- a/base/server/src/scriptlets/security_databases.py
+++ b/base/server/src/scriptlets/security_databases.py
@@ -20,9 +20,9 @@
 #
 
 # PKI Deployment Imports
-import pkiconfig as config
-import pkimessages as log
-import pkiscriptlet
+from . import pkiconfig as config
+from . import pkimessages as log
+from . import pkiscriptlet
 
 
 # PKI Deployment Security Databases Scriptlet
diff --git a/base/server/src/scriptlets/selinux_setup.py b/base/server/src/scriptlets/selinux_setup.py
index 5e3a5ab0d..9f9ad8b8b 100644
--- a/base/server/src/scriptlets/selinux_setup.py
+++ b/base/server/src/scriptlets/selinux_setup.py
@@ -19,16 +19,17 @@
 # All rights reserved.
 #
 
-# PKI Deployment Imports
-import pkiconfig as config
-from pkiconfig import pki_selinux_config_ports as ports
-import pkimessages as log
-import pkiscriptlet
 import selinux
 import time
 if selinux.is_selinux_enabled():
     import seobject
 
+# 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):
diff --git a/base/server/src/scriptlets/slot_substitution.py b/base/server/src/scriptlets/slot_substitution.py
index bd3211b9d..2bb888dfd 100644
--- a/base/server/src/scriptlets/slot_substitution.py
+++ b/base/server/src/scriptlets/slot_substitution.py
@@ -20,9 +20,9 @@
 #
 
 # PKI Deployment Imports
-import pkiconfig as config
-import pkimessages as log
-import pkiscriptlet
+from . import pkiconfig as config
+from . import pkimessages as log
+from . import pkiscriptlet
 
 
 # PKI Deployment Slot Substitution Scriptlet
diff --git a/base/server/src/scriptlets/subsystem_layout.py b/base/server/src/scriptlets/subsystem_layout.py
index 8e4841776..81dedf68c 100644
--- a/base/server/src/scriptlets/subsystem_layout.py
+++ b/base/server/src/scriptlets/subsystem_layout.py
@@ -20,9 +20,9 @@
 #
 
 # PKI Deployment Imports
-import pkiconfig as config
-import pkimessages as log
-import pkiscriptlet
+from . import pkiconfig as config
+from . import pkimessages as log
+from . import pkiscriptlet
 
 
 # PKI Deployment Subsystem Layout Scriptlet
diff --git a/base/server/src/scriptlets/webapp_deployment.py b/base/server/src/scriptlets/webapp_deployment.py
index bd8de9a15..4a37b6df9 100644
--- a/base/server/src/scriptlets/webapp_deployment.py
+++ b/base/server/src/scriptlets/webapp_deployment.py
@@ -22,11 +22,10 @@
 # System Imports
 import os
 
-
 # PKI Deployment Imports
-import pkiconfig as config
-import pkimessages as log
-import pkiscriptlet
+from . import pkiconfig as config
+from . import pkimessages as log
+from . import pkiscriptlet
 
 
 # PKI Web Application Deployment Scriptlet