From 354039321ee0367e1c094c2e15c839f4177f0e6a Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Mon, 2 Oct 2017 17:03:44 +0200
Subject: [PATCH] Fix raise call for Python3 support
---
library/ipaapi.py | 2 +-
library/ipadiscovery.py | 2 +-
library/ipaextras.py | 2 +-
library/ipafstore.py | 2 +-
library/ipajoin.py | 2 +-
library/ipanss.py | 2 +-
library/ipatest.py | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/library/ipaapi.py b/library/ipaapi.py
index 524962fd..81dc4479 100644
--- a/library/ipaapi.py
+++ b/library/ipaapi.py
@@ -80,7 +80,7 @@ import inspect
from ansible.module_utils.basic import AnsibleModule
from ipapython.version import NUM_VERSION, VERSION
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
if NUM_VERSION >= 40500 and NUM_VERSION < 40590:
from cryptography.hazmat.primitives import serialization
diff --git a/library/ipadiscovery.py b/library/ipadiscovery.py
index 3dfb8f2c..de808b97 100644
--- a/library/ipadiscovery.py
+++ b/library/ipadiscovery.py
@@ -149,7 +149,7 @@ from six.moves.configparser import RawConfigParser
from ansible.module_utils.basic import AnsibleModule
from ipapython.version import NUM_VERSION, VERSION
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:
# See ipapython/version.py
IPA_MAJOR,IPA_MINOR,IPA_RELEASE = [ int(x) for x in VERSION.split(".", 2) ]
diff --git a/library/ipaextras.py b/library/ipaextras.py
index 124c21aa..0e0c7257 100644
--- a/library/ipaextras.py
+++ b/library/ipaextras.py
@@ -108,7 +108,7 @@ import logging
from ansible.module_utils.basic import AnsibleModule
from ipapython.version import NUM_VERSION, VERSION
if NUM_VERSION < 40400:
- raise Exception, "freeipa version '%s' is too old" % VERSION
+ raise Exception("freeipa version '%s' is too old" % VERSION)
try:
from ipalib.install import sysrestore
except ImportError:
diff --git a/library/ipafstore.py b/library/ipafstore.py
index c6bc34b7..0613c66b 100644
--- a/library/ipafstore.py
+++ b/library/ipafstore.py
@@ -54,7 +54,7 @@ RETURN = '''
from ansible.module_utils.basic import AnsibleModule
from ipapython.version import NUM_VERSION, VERSION
if NUM_VERSION < 40400:
- raise Exception, "freeipa version '%s' is too old" % VERSION
+ raise Exception("freeipa version '%s' is too old" % VERSION)
try:
from ipalib.install import sysrestore
except ImportError:
diff --git a/library/ipajoin.py b/library/ipajoin.py
index 6c515cef..42070ea2 100644
--- a/library/ipajoin.py
+++ b/library/ipajoin.py
@@ -127,7 +127,7 @@ import inspect
from ansible.module_utils.basic import AnsibleModule
from ipapython.version import NUM_VERSION, VERSION
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 ipaplatform.paths import paths
try:
diff --git a/library/ipanss.py b/library/ipanss.py
index 290ab3df..6ae72a3b 100644
--- a/library/ipanss.py
+++ b/library/ipanss.py
@@ -95,7 +95,7 @@ import inspect
from ansible.module_utils.basic import AnsibleModule
from ipapython.version import NUM_VERSION, VERSION
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
try:
from ipalib.install import certmonger
diff --git a/library/ipatest.py b/library/ipatest.py
index 5f51c133..df1bd7ac 100644
--- a/library/ipatest.py
+++ b/library/ipatest.py
@@ -105,7 +105,7 @@ import inspect
from ansible.module_utils.basic import AnsibleModule
from ipapython.version import NUM_VERSION, VERSION
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
try:
from ipalib.install.kinit import kinit_keytab
--
GitLab