mirror of
https://github.com/freeipa/ansible-freeipa.git
synced 2026-07-31 11:54:47 +00:00
Fix raise call for Python3 support
This commit is contained in:
@@ -80,7 +80,7 @@ import inspect
|
|||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
from ipapython.version import NUM_VERSION, VERSION
|
from ipapython.version import NUM_VERSION, VERSION
|
||||||
if NUM_VERSION < 40400:
|
if NUM_VERSION < 40400:
|
||||||
raise Exception, "freeipa version '%s' is too old" % VERSION
|
raise Exception("freeipa version '%s' is too old" % VERSION)
|
||||||
from ipaplatform.paths import paths
|
from ipaplatform.paths import paths
|
||||||
if NUM_VERSION >= 40500 and NUM_VERSION < 40590:
|
if NUM_VERSION >= 40500 and NUM_VERSION < 40590:
|
||||||
from cryptography.hazmat.primitives import serialization
|
from cryptography.hazmat.primitives import serialization
|
||||||
|
|||||||
@@ -149,7 +149,7 @@ from six.moves.configparser import RawConfigParser
|
|||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
from ipapython.version import NUM_VERSION, VERSION
|
from ipapython.version import NUM_VERSION, VERSION
|
||||||
if NUM_VERSION < 40400:
|
if NUM_VERSION < 40400:
|
||||||
raise Exception, "freeipa version '%s' is too old" % VERSION
|
raise Exception("freeipa version '%s' is too old" % VERSION)
|
||||||
if NUM_VERSION < 30201:
|
if NUM_VERSION < 30201:
|
||||||
# See ipapython/version.py
|
# See ipapython/version.py
|
||||||
IPA_MAJOR,IPA_MINOR,IPA_RELEASE = [ int(x) for x in VERSION.split(".", 2) ]
|
IPA_MAJOR,IPA_MINOR,IPA_RELEASE = [ int(x) for x in VERSION.split(".", 2) ]
|
||||||
|
|||||||
@@ -108,7 +108,7 @@ import logging
|
|||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
from ipapython.version import NUM_VERSION, VERSION
|
from ipapython.version import NUM_VERSION, VERSION
|
||||||
if NUM_VERSION < 40400:
|
if NUM_VERSION < 40400:
|
||||||
raise Exception, "freeipa version '%s' is too old" % VERSION
|
raise Exception("freeipa version '%s' is too old" % VERSION)
|
||||||
try:
|
try:
|
||||||
from ipalib.install import sysrestore
|
from ipalib.install import sysrestore
|
||||||
except ImportError:
|
except ImportError:
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ RETURN = '''
|
|||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
from ipapython.version import NUM_VERSION, VERSION
|
from ipapython.version import NUM_VERSION, VERSION
|
||||||
if NUM_VERSION < 40400:
|
if NUM_VERSION < 40400:
|
||||||
raise Exception, "freeipa version '%s' is too old" % VERSION
|
raise Exception("freeipa version '%s' is too old" % VERSION)
|
||||||
try:
|
try:
|
||||||
from ipalib.install import sysrestore
|
from ipalib.install import sysrestore
|
||||||
except ImportError:
|
except ImportError:
|
||||||
|
|||||||
@@ -127,7 +127,7 @@ import inspect
|
|||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
from ipapython.version import NUM_VERSION, VERSION
|
from ipapython.version import NUM_VERSION, VERSION
|
||||||
if NUM_VERSION < 40400:
|
if NUM_VERSION < 40400:
|
||||||
raise Exception, "freeipa version '%s' is too old" % VERSION
|
raise Exception("freeipa version '%s' is too old" % VERSION)
|
||||||
from ipalib import errors
|
from ipalib import errors
|
||||||
from ipaplatform.paths import paths
|
from ipaplatform.paths import paths
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ import inspect
|
|||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
from ipapython.version import NUM_VERSION, VERSION
|
from ipapython.version import NUM_VERSION, VERSION
|
||||||
if NUM_VERSION < 40400:
|
if NUM_VERSION < 40400:
|
||||||
raise Exception, "freeipa version '%s' is too old" % VERSION
|
raise Exception("freeipa version '%s' is too old" % VERSION)
|
||||||
from ipalib import api, errors, x509
|
from ipalib import api, errors, x509
|
||||||
try:
|
try:
|
||||||
from ipalib.install import certmonger
|
from ipalib.install import certmonger
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ import inspect
|
|||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
from ipapython.version import NUM_VERSION, VERSION
|
from ipapython.version import NUM_VERSION, VERSION
|
||||||
if NUM_VERSION < 40400:
|
if NUM_VERSION < 40400:
|
||||||
raise Exception, "freeipa version '%s' is too old" % VERSION
|
raise Exception("freeipa version '%s' is too old" % VERSION)
|
||||||
from ipaplatform.paths import paths
|
from ipaplatform.paths import paths
|
||||||
try:
|
try:
|
||||||
from ipalib.install.kinit import kinit_keytab
|
from ipalib.install.kinit import kinit_keytab
|
||||||
|
|||||||
Reference in New Issue
Block a user