Py3 modernization: libmodernize.fixes.fix_import

Enforce absolute imports or explicit relative imports. Python 3 no
longer supports implicit relative imports, that is unqualified imports
from a module's directory. In order to load a module from the same
directory inside a package, use

    from . import module

The future feature 'from __future__ import absolute_import' ensures that
pki uses absolute imports on Python 2, too.

See https://www.python.org/dev/peps/pep-0328/

71 files changed, 78 insertions, 3 deletions

diff --git a/base/common/python/conf.py b/base/common/python/conf.py
index 67c59e610..ee5d028d1 100644
--- a/base/common/python/conf.py
+++ b/base/common/python/conf.py
@@ -11,7 +11,9 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+from __future__ import absolute_import
+import sys
+import os
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
diff --git a/base/common/python/pki/__init__.py b/base/common/python/pki/__init__.py
index 39a0db717..f488827d2 100644
--- a/base/common/python/pki/__init__.py
+++ b/base/common/python/pki/__init__.py
@@ -21,6 +21,7 @@
 """
 This module contains top-level classes and functions used by the Dogtag project.
 """
+from __future__ import absolute_import
 from functools import wraps
 import os
 import re
diff --git a/base/common/python/pki/account.py b/base/common/python/pki/account.py
index c8c7cd78b..9125df875 100644
--- a/base/common/python/pki/account.py
+++ b/base/common/python/pki/account.py
@@ -18,6 +18,7 @@
 # Copyright (C) 2013 Red Hat, Inc.
 # All rights reserved.
 #
+from __future__ import absolute_import
 import pki
 
 
diff --git a/base/common/python/pki/cert.py b/base/common/python/pki/cert.py
index 01d2a616b..af85b5096 100644
--- a/base/common/python/pki/cert.py
+++ b/base/common/python/pki/cert.py
@@ -20,6 +20,7 @@
 #     Abhishek Koneru <akoneru@redhat.com>
 #     Ade Lee <alee@redhat.com>
 
+from __future__ import absolute_import
 import copy
 import json
 import types
diff --git a/base/common/python/pki/cli/__init__.py b/base/common/python/pki/cli/__init__.py
index 2c51056f8..a57cc24d3 100644
--- a/base/common/python/pki/cli/__init__.py
+++ b/base/common/python/pki/cli/__init__.py
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import collections
 import getopt
 import sys
diff --git a/base/common/python/pki/client.py b/base/common/python/pki/client.py
index d28a41d63..7f59c2f2a 100644
--- a/base/common/python/pki/client.py
+++ b/base/common/python/pki/client.py
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import functools
 import warnings
 
diff --git a/base/common/python/pki/crypto.py b/base/common/python/pki/crypto.py
index 147e65447..0dc6927ef 100644
--- a/base/common/python/pki/crypto.py
+++ b/base/common/python/pki/crypto.py
@@ -21,6 +21,7 @@
 """
 Module containing crypto classes.
 """
+from __future__ import absolute_import
 import abc
 import exceptions
 import nss.nss as nss
diff --git a/base/common/python/pki/encoder.py b/base/common/python/pki/encoder.py
index 1af0feaad..ccf852e0c 100644
--- a/base/common/python/pki/encoder.py
+++ b/base/common/python/pki/encoder.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import json
 
 TYPES = {}
diff --git a/base/common/python/pki/key.py b/base/common/python/pki/key.py
index 3ff6e3dba..ae382ae0a 100644
--- a/base/common/python/pki/key.py
+++ b/base/common/python/pki/key.py
@@ -24,6 +24,7 @@
 Module containing the Python client classes for the KeyClient and
 KeyRequestClient REST API on a DRM
 """
+from __future__ import absolute_import
 import base64
 import json
 import types
diff --git a/base/common/python/pki/kra.py b/base/common/python/pki/kra.py
index 9e46235d2..ca756c3c1 100644
--- a/base/common/python/pki/kra.py
+++ b/base/common/python/pki/kra.py
@@ -25,6 +25,7 @@ to interact with the DRM to expose the functionality of the KeyClient and
 KeyRequestResource REST APIs.
 """
 
+from __future__ import absolute_import
 import pki.key as key
 
 from pki.systemcert import SystemCertClient
diff --git a/base/common/python/pki/profile.py b/base/common/python/pki/profile.py
index 050f854a4..d553df446 100644
--- a/base/common/python/pki/profile.py
+++ b/base/common/python/pki/profile.py
@@ -17,6 +17,7 @@
 #
 # @author: Abhishek Koneru <akoneru@redhat.com>
 
+from __future__ import absolute_import
 import json
 import os
 import types
diff --git a/base/common/python/pki/system.py b/base/common/python/pki/system.py
index 76b505909..6f44220bd 100644
--- a/base/common/python/pki/system.py
+++ b/base/common/python/pki/system.py
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import pki.encoder as encoder
 import xml.etree.ElementTree as ETree
 import os
diff --git a/base/common/python/pki/systemcert.py b/base/common/python/pki/systemcert.py
index d59e07b3d..ab836fd3c 100644
--- a/base/common/python/pki/systemcert.py
+++ b/base/common/python/pki/systemcert.py
@@ -21,6 +21,7 @@
 """
 Module containing the Python client classes for the SystemCert REST API
 """
+from __future__ import absolute_import
 import base64
 import pki
 from pki.cert import CertData
diff --git a/base/common/python/pki/upgrade.py b/base/common/python/pki/upgrade.py
index 5534069c1..812a33d58 100644
--- a/base/common/python/pki/upgrade.py
+++ b/base/common/python/pki/upgrade.py
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import functools
 import os
 import re
diff --git a/base/common/python/pki/util.py b/base/common/python/pki/util.py
index 19f6be720..55fa3b317 100644
--- a/base/common/python/pki/util.py
+++ b/base/common/python/pki/util.py
@@ -23,6 +23,7 @@ Module containing utility functions and classes for the Dogtag python code
 """
 
 
+from __future__ import absolute_import
 import os
 import shutil
 
diff --git a/base/common/sbin/pki-upgrade b/base/common/sbin/pki-upgrade
index 0fbfde3d6..146bebe3e 100755
--- a/base/common/sbin/pki-upgrade
+++ b/base/common/sbin/pki-upgrade
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import getopt
 import signal
 import sys
diff --git a/base/common/upgrade/10.0.1/01-AddJniJarDir b/base/common/upgrade/10.0.1/01-AddJniJarDir
index 1419eb9e5..bc9d708b8 100755
--- a/base/common/upgrade/10.0.1/01-AddJniJarDir
+++ b/base/common/upgrade/10.0.1/01-AddJniJarDir
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import os
 
 import pki
diff --git a/base/common/upgrade/10.0.3/01-RemoveJniJarDir b/base/common/upgrade/10.0.3/01-RemoveJniJarDir
index 86ff54a60..6eb08e87c 100755
--- a/base/common/upgrade/10.0.3/01-RemoveJniJarDir
+++ b/base/common/upgrade/10.0.3/01-RemoveJniJarDir
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import os
 
 import pki
diff --git a/base/kra/functional/drmclient_deprecated.py b/base/kra/functional/drmclient_deprecated.py
index 602057f92..7268b3fcb 100644
--- a/base/kra/functional/drmclient_deprecated.py
+++ b/base/kra/functional/drmclient_deprecated.py
@@ -34,6 +34,7 @@ key, this data can be stored in and retrieved from the KRA.
 A sample test execution is provided at the end of the file.
 '''
 
+from __future__ import absolute_import
 from lxml import etree
 import nss.nss as nss
 import httplib
diff --git a/base/kra/functional/drmtest.py b/base/kra/functional/drmtest.py
index 0a7bbeaae..ab6c53b4b 100755
--- a/base/kra/functional/drmtest.py
+++ b/base/kra/functional/drmtest.py
@@ -32,6 +32,7 @@ Some setup is required to run the tests here successfully.
 See drmtest.readme.txt.
 """
 
+from __future__ import absolute_import
 import base64
 import getopt
 import os
diff --git a/base/server/python/pki/server/__init__.py b/base/server/python/pki/server/__init__.py
index 4376135e7..5803f3f52 100644
--- a/base/server/python/pki/server/__init__.py
+++ b/base/server/python/pki/server/__init__.py
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 from lxml import etree
 import getpass
 import grp
diff --git a/base/server/python/pki/server/cli/instance.py b/base/server/python/pki/server/cli/instance.py
index f69c3f8fd..16a3355c3 100644
--- a/base/server/python/pki/server/cli/instance.py
+++ b/base/server/python/pki/server/cli/instance.py
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import getopt
 import getpass
 import os
diff --git a/base/server/python/pki/server/cli/migrate.py b/base/server/python/pki/server/cli/migrate.py
index cb3ba8f6c..8b59aac05 100644
--- a/base/server/python/pki/server/cli/migrate.py
+++ b/base/server/python/pki/server/cli/migrate.py
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import getopt
 import os
 import sys
diff --git a/base/server/python/pki/server/cli/nuxwdog.py b/base/server/python/pki/server/cli/nuxwdog.py
index 5f14e61fe..8d93d82dc 100644
--- a/base/server/python/pki/server/cli/nuxwdog.py
+++ b/base/server/python/pki/server/cli/nuxwdog.py
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import getopt
 import fileinput
 import os
diff --git a/base/server/python/pki/server/deployment/pkihelper.py b/base/server/python/pki/server/deployment/pkihelper.py
index e8591398d..2bec60cee 100644
--- a/base/server/python/pki/server/deployment/pkihelper.py
+++ b/base/server/python/pki/server/deployment/pkihelper.py
@@ -21,6 +21,7 @@
 #
 
 # System Imports
+from __future__ import absolute_import
 import errno
 import sys
 import os
diff --git a/base/server/python/pki/server/deployment/pkilogging.py b/base/server/python/pki/server/deployment/pkilogging.py
index 14c11cf4d..6378ff062 100644
--- a/base/server/python/pki/server/deployment/pkilogging.py
+++ b/base/server/python/pki/server/deployment/pkilogging.py
@@ -20,6 +20,7 @@
 #
 
 # System Imports
+from __future__ import absolute_import
 import logging
 import os
 import pprint
diff --git a/base/server/python/pki/server/deployment/pkimanifest.py b/base/server/python/pki/server/deployment/pkimanifest.py
index 593fb20d3..c7a24b5be 100644
--- a/base/server/python/pki/server/deployment/pkimanifest.py
+++ b/base/server/python/pki/server/deployment/pkimanifest.py
@@ -20,6 +20,7 @@
 #
 
 # System Imports
+from __future__ import absolute_import
 import csv
 
 # PKI Deployment Imports
diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py
index 02af1352d..8ccea422d 100644
--- a/base/server/python/pki/server/deployment/pkiparser.py
+++ b/base/server/python/pki/server/deployment/pkiparser.py
@@ -20,6 +20,7 @@
 #
 
 # System Imports
+from __future__ import absolute_import
 import ConfigParser
 import argparse
 import getpass
diff --git a/base/server/python/pki/server/deployment/pkiscriptlet.py b/base/server/python/pki/server/deployment/pkiscriptlet.py
index c446c18f8..e79231c60 100644
--- a/base/server/python/pki/server/deployment/pkiscriptlet.py
+++ b/base/server/python/pki/server/deployment/pkiscriptlet.py
@@ -20,6 +20,7 @@
 #
 
 # System Imports
+from __future__ import absolute_import
 import abc
 
 
diff --git a/base/server/python/pki/server/deployment/scriptlets/configuration.py b/base/server/python/pki/server/deployment/scriptlets/configuration.py
index e7b257f7d..278ac644b 100644
--- a/base/server/python/pki/server/deployment/scriptlets/configuration.py
+++ b/base/server/python/pki/server/deployment/scriptlets/configuration.py
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import json
 import re
 
diff --git a/base/server/python/pki/server/deployment/scriptlets/finalization.py b/base/server/python/pki/server/deployment/scriptlets/finalization.py
index 4c98cc499..3c4f469ac 100644
--- a/base/server/python/pki/server/deployment/scriptlets/finalization.py
+++ b/base/server/python/pki/server/deployment/scriptlets/finalization.py
@@ -19,6 +19,8 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
+
 # PKI Deployment Imports
 from .. import pkiconfig as config
 from .. import pkimanifest as manifest
diff --git a/base/server/python/pki/server/deployment/scriptlets/infrastructure_layout.py b/base/server/python/pki/server/deployment/scriptlets/infrastructure_layout.py
index fcd9fa63e..76a82c68e 100644
--- a/base/server/python/pki/server/deployment/scriptlets/infrastructure_layout.py
+++ b/base/server/python/pki/server/deployment/scriptlets/infrastructure_layout.py
@@ -19,6 +19,8 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
+
 # PKI Deployment Imports
 from .. import pkiconfig as config
 from .. import pkimessages as log
diff --git a/base/server/python/pki/server/deployment/scriptlets/initialization.py b/base/server/python/pki/server/deployment/scriptlets/initialization.py
index 9545c4d4e..532149943 100644
--- a/base/server/python/pki/server/deployment/scriptlets/initialization.py
+++ b/base/server/python/pki/server/deployment/scriptlets/initialization.py
@@ -19,6 +19,8 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
+
 # PKI Deployment Imports
 from .. import pkiconfig as config
 from .. import pkimessages as log
diff --git a/base/server/python/pki/server/deployment/scriptlets/instance_layout.py b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py
index 6cd98bb35..4ed505143 100644
--- a/base/server/python/pki/server/deployment/scriptlets/instance_layout.py
+++ b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py
@@ -20,6 +20,7 @@
 #
 
 # System Imports
+from __future__ import absolute_import
 import os
 
 # PKI Deployment Imports
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 7075f6e56..0fa3e6c11 100644
--- a/base/server/python/pki/server/deployment/scriptlets/selinux_setup.py
+++ b/base/server/python/pki/server/deployment/scriptlets/selinux_setup.py
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import selinux
 import time
 if selinux.is_selinux_enabled():
diff --git a/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py b/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py
index cbcd7e342..b35989cc9 100644
--- a/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py
+++ b/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py
@@ -19,6 +19,8 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
+
 # PKI Deployment Imports
 from .. import pkiconfig as config
 from .. import pkimessages as log
diff --git a/base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py b/base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py
index 2cad0cf4a..598a235c9 100644
--- a/base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py
+++ b/base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py
@@ -19,6 +19,8 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
+
 # PKI Deployment Imports
 from .. import pkiconfig as config
 from .. import pkimessages as log
diff --git a/base/server/python/pki/server/deployment/scriptlets/webapp_deployment.py b/base/server/python/pki/server/deployment/scriptlets/webapp_deployment.py
index edbfafab3..2dafe6f81 100644
--- a/base/server/python/pki/server/deployment/scriptlets/webapp_deployment.py
+++ b/base/server/python/pki/server/deployment/scriptlets/webapp_deployment.py
@@ -20,6 +20,7 @@
 #
 
 # System Imports
+from __future__ import absolute_import
 import os
 
 # PKI Deployment Imports
diff --git a/base/server/python/pki/server/upgrade.py b/base/server/python/pki/server/upgrade.py
index f82ffe670..1477fdda5 100644
--- a/base/server/python/pki/server/upgrade.py
+++ b/base/server/python/pki/server/upgrade.py
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import os
 import traceback
 
diff --git a/base/server/sbin/pki-server b/base/server/sbin/pki-server
index cf56d1bc4..37fbfec0b 100644
--- a/base/server/sbin/pki-server
+++ b/base/server/sbin/pki-server
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import getopt
 import sys
 
diff --git a/base/server/sbin/pki-server-upgrade b/base/server/sbin/pki-server-upgrade
index d149bc045..6f4bed802 100755
--- a/base/server/sbin/pki-server-upgrade
+++ b/base/server/sbin/pki-server-upgrade
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import getopt
 import signal
 import sys
diff --git a/base/server/sbin/pkidestroy b/base/server/sbin/pkidestroy
index 459b75596..5ba59e79a 100755
--- a/base/server/sbin/pkidestroy
+++ b/base/server/sbin/pkidestroy
@@ -20,6 +20,7 @@
 #
 
 # System Imports
+from __future__ import absolute_import
 import sys
 import signal
 
diff --git a/base/server/sbin/pkispawn b/base/server/sbin/pkispawn
index f362b9e92..4d2822af8 100755
--- a/base/server/sbin/pkispawn
+++ b/base/server/sbin/pkispawn
@@ -20,6 +20,7 @@
 #
 
 # System Imports
+from __future__ import absolute_import
 import sys
 import signal
 
diff --git a/base/server/upgrade/10.0.1/01-ReplaceRandomNumberGenerator b/base/server/upgrade/10.0.1/01-ReplaceRandomNumberGenerator
index 5cf4e581b..6df6d168a 100755
--- a/base/server/upgrade/10.0.1/01-ReplaceRandomNumberGenerator
+++ b/base/server/upgrade/10.0.1/01-ReplaceRandomNumberGenerator
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import os
 import shutil
 from lxml import etree
diff --git a/base/server/upgrade/10.0.1/02-CloningInterfaceChanges b/base/server/upgrade/10.0.1/02-CloningInterfaceChanges
index 5960f1d2d..e74f7ca9f 100755
--- a/base/server/upgrade/10.0.1/02-CloningInterfaceChanges
+++ b/base/server/upgrade/10.0.1/02-CloningInterfaceChanges
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import os
 from lxml import etree as ET
 
diff --git a/base/server/upgrade/10.0.1/03-AddRestServlet b/base/server/upgrade/10.0.1/03-AddRestServlet
index 2f375cd42..c0b9c8ca2 100755
--- a/base/server/upgrade/10.0.1/03-AddRestServlet
+++ b/base/server/upgrade/10.0.1/03-AddRestServlet
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import os
 from lxml import etree as ET
 
diff --git a/base/server/upgrade/10.0.5/01-EnableSessionInAuthenticator b/base/server/upgrade/10.0.5/01-EnableSessionInAuthenticator
index fe954c662..b7f3a4a82 100755
--- a/base/server/upgrade/10.0.5/01-EnableSessionInAuthenticator
+++ b/base/server/upgrade/10.0.5/01-EnableSessionInAuthenticator
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import os
 from lxml import etree
 
diff --git a/base/server/upgrade/10.0.99/01-FixJavaOpts b/base/server/upgrade/10.0.99/01-FixJavaOpts
index da2ece18a..f981017a7 100755
--- a/base/server/upgrade/10.0.99/01-FixJavaOpts
+++ b/base/server/upgrade/10.0.99/01-FixJavaOpts
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import re
 import pki.server.upgrade
 
diff --git a/base/server/upgrade/10.0.99/02-RemoveAuthProperties b/base/server/upgrade/10.0.99/02-RemoveAuthProperties
index b5894fafe..fb132437c 100755
--- a/base/server/upgrade/10.0.99/02-RemoveAuthProperties
+++ b/base/server/upgrade/10.0.99/02-RemoveAuthProperties
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import os
 import pki
 import pki.server.upgrade
diff --git a/base/server/upgrade/10.0.99/03-FixRegistryFile b/base/server/upgrade/10.0.99/03-FixRegistryFile
index ae417578a..3fbadb114 100755
--- a/base/server/upgrade/10.0.99/03-FixRegistryFile
+++ b/base/server/upgrade/10.0.99/03-FixRegistryFile
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import os
 import re
 import pki.server
diff --git a/base/server/upgrade/10.0.99/04-FixLogFileOwnership b/base/server/upgrade/10.0.99/04-FixLogFileOwnership
index 964d50b7d..0daec4b3d 100755
--- a/base/server/upgrade/10.0.99/04-FixLogFileOwnership
+++ b/base/server/upgrade/10.0.99/04-FixLogFileOwnership
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import os
 import pki.server.upgrade
 
diff --git a/base/server/upgrade/10.1.1/01-MoveWebApplicationContextFile b/base/server/upgrade/10.1.1/01-MoveWebApplicationContextFile
index 76dbb23d6..b567e03a0 100755
--- a/base/server/upgrade/10.1.1/01-MoveWebApplicationContextFile
+++ b/base/server/upgrade/10.1.1/01-MoveWebApplicationContextFile
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import os
 
 import pki.server.upgrade
diff --git a/base/server/upgrade/10.1.99/01-MoveWebApplicationContextFile b/base/server/upgrade/10.1.99/01-MoveWebApplicationContextFile
index 76dbb23d6..b567e03a0 100755
--- a/base/server/upgrade/10.1.99/01-MoveWebApplicationContextFile
+++ b/base/server/upgrade/10.1.99/01-MoveWebApplicationContextFile
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import os
 
 import pki.server.upgrade
diff --git a/base/server/upgrade/10.1.99/02-ReplaceJettisonWithJackson b/base/server/upgrade/10.1.99/02-ReplaceJettisonWithJackson
index b74f9d3ee..3e20f6b25 100755
--- a/base/server/upgrade/10.1.99/02-ReplaceJettisonWithJackson
+++ b/base/server/upgrade/10.1.99/02-ReplaceJettisonWithJackson
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import os
 import subprocess
 
diff --git a/base/server/upgrade/10.1.99/03-AddedRESTEasyClient b/base/server/upgrade/10.1.99/03-AddedRESTEasyClient
index e9a720eaf..40169bc66 100755
--- a/base/server/upgrade/10.1.99/03-AddedRESTEasyClient
+++ b/base/server/upgrade/10.1.99/03-AddedRESTEasyClient
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import os
 import subprocess
 
diff --git a/base/server/upgrade/10.1.99/04-ReplaceRESTEasyApplicationClass b/base/server/upgrade/10.1.99/04-ReplaceRESTEasyApplicationClass
index 870fa981c..cf61c1119 100755
--- a/base/server/upgrade/10.1.99/04-ReplaceRESTEasyApplicationClass
+++ b/base/server/upgrade/10.1.99/04-ReplaceRESTEasyApplicationClass
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import os
 from lxml import etree as ET
 
diff --git a/base/server/upgrade/10.1.99/05-RemoveConfigPathFromWebXML b/base/server/upgrade/10.1.99/05-RemoveConfigPathFromWebXML
index edc27e3f8..0023d52c0 100755
--- a/base/server/upgrade/10.1.99/05-RemoveConfigPathFromWebXML
+++ b/base/server/upgrade/10.1.99/05-RemoveConfigPathFromWebXML
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import os
 from lxml import etree
 
diff --git a/base/server/upgrade/10.2.1/01-AddTLSRangeSupport b/base/server/upgrade/10.2.1/01-AddTLSRangeSupport
index e2259245b..8c0de5382 100755
--- a/base/server/upgrade/10.2.1/01-AddTLSRangeSupport
+++ b/base/server/upgrade/10.2.1/01-AddTLSRangeSupport
@@ -20,6 +20,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import os
 from lxml import etree
 
diff --git a/base/server/upgrade/10.2.2/01-MoveWebApplicationDeploymentLocations b/base/server/upgrade/10.2.2/01-MoveWebApplicationDeploymentLocations
index 8d63a5563..9a7329381 100755
--- a/base/server/upgrade/10.2.2/01-MoveWebApplicationDeploymentLocations
+++ b/base/server/upgrade/10.2.2/01-MoveWebApplicationDeploymentLocations
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import os
 import shutil
 from lxml import etree
diff --git a/base/server/upgrade/10.2.2/02-EnableWebApplicationAutoDeploy b/base/server/upgrade/10.2.2/02-EnableWebApplicationAutoDeploy
index 6e2731d27..4baae6dca 100755
--- a/base/server/upgrade/10.2.2/02-EnableWebApplicationAutoDeploy
+++ b/base/server/upgrade/10.2.2/02-EnableWebApplicationAutoDeploy
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import os
 from lxml import etree
 
diff --git a/base/server/upgrade/10.2.2/03-RemoveDependencyOnJackson2 b/base/server/upgrade/10.2.2/03-RemoveDependencyOnJackson2
index 0c66eadaa..946a1c354 100755
--- a/base/server/upgrade/10.2.2/03-RemoveDependencyOnJackson2
+++ b/base/server/upgrade/10.2.2/03-RemoveDependencyOnJackson2
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import os
 
 import pki.server.upgrade
diff --git a/base/server/upgrade/10.2.3/01-FixInstanceWorkFolderOwnership b/base/server/upgrade/10.2.3/01-FixInstanceWorkFolderOwnership
index 3c7f21aaf..9c65e30ed 100755
--- a/base/server/upgrade/10.2.3/01-FixInstanceWorkFolderOwnership
+++ b/base/server/upgrade/10.2.3/01-FixInstanceWorkFolderOwnership
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import os
 import pki.server.upgrade
 
diff --git a/base/server/upgrade/10.2.3/02-FixBindPWPrompt b/base/server/upgrade/10.2.3/02-FixBindPWPrompt
index ede12f462..3157aa795 100755
--- a/base/server/upgrade/10.2.3/02-FixBindPWPrompt
+++ b/base/server/upgrade/10.2.3/02-FixBindPWPrompt
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import fileinput
 import os
 import re
diff --git a/base/server/upgrade/10.2.4/01-AddMissingOCSPGETServletMappingToWebXML b/base/server/upgrade/10.2.4/01-AddMissingOCSPGETServletMappingToWebXML
index dfc6a98a6..e82de5385 100755
--- a/base/server/upgrade/10.2.4/01-AddMissingOCSPGETServletMappingToWebXML
+++ b/base/server/upgrade/10.2.4/01-AddMissingOCSPGETServletMappingToWebXML
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import os
 from lxml import etree as ET
 
diff --git a/base/server/upgrade/10.2.4/02-FixNuxwdogListenerClass b/base/server/upgrade/10.2.4/02-FixNuxwdogListenerClass
index 2eb381db3..3a6a3dbdd 100755
--- a/base/server/upgrade/10.2.4/02-FixNuxwdogListenerClass
+++ b/base/server/upgrade/10.2.4/02-FixNuxwdogListenerClass
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import subprocess
 
 import pki.server.upgrade
diff --git a/base/server/upgrade/10.2.5/01-AddKraAuditEvents b/base/server/upgrade/10.2.5/01-AddKraAuditEvents
index 389bd718e..e05c919a5 100644
--- a/base/server/upgrade/10.2.5/01-AddKraAuditEvents
+++ b/base/server/upgrade/10.2.5/01-AddKraAuditEvents
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import os
 
 import pki
diff --git a/base/server/upgrade/10.2.6/01-RemoveInaccessableURLsFromServerXML b/base/server/upgrade/10.2.6/01-RemoveInaccessableURLsFromServerXML
index 240fd28fc..cfdfe4229 100755
--- a/base/server/upgrade/10.2.6/01-RemoveInaccessableURLsFromServerXML
+++ b/base/server/upgrade/10.2.6/01-RemoveInaccessableURLsFromServerXML
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import subprocess
 
 import pki.server.upgrade
diff --git a/base/server/upgrade/10.2.6/02-AddPhoneHomeURLsToTPSsServerXML b/base/server/upgrade/10.2.6/02-AddPhoneHomeURLsToTPSsServerXML
index 1cf7413ed..d24ebe4f1 100755
--- a/base/server/upgrade/10.2.6/02-AddPhoneHomeURLsToTPSsServerXML
+++ b/base/server/upgrade/10.2.6/02-AddPhoneHomeURLsToTPSsServerXML
@@ -19,6 +19,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import os
 
 import pki.server.upgrade
diff --git a/setup.py b/setup.py
index 3b808a384..034c7d037 100644
--- a/setup.py
+++ b/setup.py
@@ -18,6 +18,7 @@
 # All rights reserved.
 #
 
+from __future__ import absolute_import
 import os
 import re
 from distutils.core import setup
diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index 66d6bded4..5d8d9f69a 100644
--- a/specs/pki-core.spec
+++ b/specs/pki-core.spec
@@ -729,7 +729,7 @@ done
 
 %if ! 0%{?rhel}
 # Scanning the python code with pylint.
-sh ../pylint-build-scan.sh %{buildroot} `pwd`
+python ../pylint-build-scan.py rpm --prefix %{buildroot}
 if [ $? -ne 0 ]; then
     echo "pylint failed. RC: $?"
     exit 1
diff --git a/tox.ini b/tox.ini
index 85a7f9b00..40ff58cac 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,7 +19,7 @@
 #
 
 [tox]
-envlist = py27,lint,docs
+envlist = py27,pep8,lint,docs
 
 [testenv]
 # force installation of sphinx and lint in virtual env, otherwise