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/

15 files changed, 17 insertions, 1 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