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 | |
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')
71 files changed, 77 insertions, 0 deletions
diff --git a/base/common/python/conf.py b/base/common/python/conf.py index ba29afa41..0f81c95dc 100644 --- a/base/common/python/conf.py +++ b/base/common/python/conf.py @@ -11,6 +11,7 @@ # All configuration values have a default; values that are commented out # serve to show the default. +from __future__ import absolute_import import sys import os diff --git a/base/common/python/pki/__init__.py b/base/common/python/pki/__init__.py index 77e5b2365..a6f01ff82 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 575491ffe..5590b35ee 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 diff --git a/base/common/python/pki/cli.py b/base/common/python/pki/cli.py index 12b8656e8..dd8b388fb 100644 --- a/base/common/python/pki/cli.py +++ b/base/common/python/pki/cli.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 2a33f0638..9c1c0f881 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 nss.nss as nss import os diff --git a/base/common/python/pki/encoder.py b/base/common/python/pki/encoder.py index 6d5725f0f..cebcc566b 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 0df868657..3433bce03 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 urllib 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 00318d0f2..70eec4083 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 diff --git a/base/common/python/pki/system.py b/base/common/python/pki/system.py index b3d5fc641..f1128fca1 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 b5f7b03b8..4adc2f18e 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 010f88c81..1206ef8ba 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 48b7c826b..72553ad5c 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/java-tools/bin/pki b/base/java-tools/bin/pki index fc61f354b..568093892 100644 --- a/base/java-tools/bin/pki +++ b/base/java-tools/bin/pki @@ -19,6 +19,7 @@ # All rights reserved. # +from __future__ import absolute_import import shlex import subprocess import sys diff --git a/base/kra/functional/drmclient_deprecated.py b/base/kra/functional/drmclient_deprecated.py index 33149bed7..99c70a184 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 d951d5f25..1d7eb3270 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 random 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 diff --git a/base/server/sbin/pki-server b/base/server/sbin/pki-server index 2afaaa547..ad70a4838 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 fa5232e10..252c504da 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 760febee2..5666531c6 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 7b477da0b..11b379465 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 3c77b424e..c4ae48eff 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 46559373d..285942a8f 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 53d97ab01..36b22697b 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 8b5187397..3eada779d 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 7fa6c937e..250b3f6f4 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 7fa6c937e..250b3f6f4 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 2da03a600..9e4fb4c12 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 1cfff29f6..efa43e503 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 4117b7e6a..3e1d47e2e 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 c9db5503b..4a3997fce 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 5689f2526..313ee0d71 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 5493e1e21..ffa94d81c 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 83ec67d6b..8aa3f29ff 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 5e4077371..8d6a40d3e 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 8fd67271c..6de2521a5 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 8dee70db6..07a5b296e 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 |