diff options
author | Christian Heimes <cheimes@redhat.com> | 2015-08-16 19:00:00 +0200 |
---|---|---|
committer | Christian Heimes <cheimes@redhat.com> | 2015-08-17 21:14:11 +0200 |
commit | 71148b8f79a5d6ba0c949a3ca0acf5aec6321f0a (patch) | |
tree | 2ae9b55f25b94c5f90b114de17c1e442499a3872 /base/server/python/pki | |
parent | 5935b765aaeb0f30844812db057020b1aaea4559 (diff) | |
download | pki-71148b8f79a5d6ba0c949a3ca0acf5aec6321f0a.tar.gz pki-71148b8f79a5d6ba0c949a3ca0acf5aec6321f0a.tar.xz pki-71148b8f79a5d6ba0c949a3ca0acf5aec6321f0a.zip |
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/
Diffstat (limited to 'base/server/python/pki')
21 files changed, 27 insertions, 0 deletions
diff --git a/base/server/python/pki/server/__init__.py b/base/server/python/pki/server/__init__.py index 3a2cf6bef..2f5fb461f 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 grp import os diff --git a/base/server/python/pki/server/cli/instance.py b/base/server/python/pki/server/cli/instance.py index 95a708bee..f9e971e8a 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 os import sys diff --git a/base/server/python/pki/server/cli/migrate.py b/base/server/python/pki/server/cli/migrate.py index de62a24b4..325462048 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 d6ef91e43..36ff3c5d5 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/cli/subsystem.py b/base/server/python/pki/server/cli/subsystem.py index a63eb86d7..2f1e7e2f8 100644 --- a/base/server/python/pki/server/cli/subsystem.py +++ b/base/server/python/pki/server/cli/subsystem.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/deployment/pkihelper.py b/base/server/python/pki/server/deployment/pkihelper.py index 62abce74e..589da5c74 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 67b9348c1..d959efb4a 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 229e71b31..08815a6b1 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 fbcb1ccaa..c6e890235 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 # PKI Deployment Imports diff --git a/base/server/python/pki/server/deployment/scriptlets/finalization.py b/base/server/python/pki/server/deployment/scriptlets/finalization.py index b92965929..56ddf0219 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 630ef38cc..365bfb763 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 378343eb5..dae5a4b14 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/security_databases.py b/base/server/python/pki/server/deployment/scriptlets/security_databases.py index 3ffe452bb..27285dd3e 100644 --- a/base/server/python/pki/server/deployment/scriptlets/security_databases.py +++ b/base/server/python/pki/server/deployment/scriptlets/security_databases.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/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 c1ee0e7b1..cc9db48e4 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 |