summaryrefslogtreecommitdiffstats
path: root/ipaserver
diff options
context:
space:
mode:
authorTomas Babej <tbabej@redhat.com>2016-01-08 18:23:35 +0100
committerMartin Basti <mbasti@redhat.com>2016-01-13 09:54:03 +0100
commit50627004b83fe155767fb02b51099eba612a5855 (patch)
tree98a5342880df3f206ce528bdd1a265a537465f42 /ipaserver
parent00c13fd340eedafe062ec5df56cdb689a5483589 (diff)
downloadfreeipa-50627004b83fe155767fb02b51099eba612a5855.tar.gz
freeipa-50627004b83fe155767fb02b51099eba612a5855.tar.xz
freeipa-50627004b83fe155767fb02b51099eba612a5855.zip
py3: Remove py3 incompatible exception handling
https://fedorahosted.org/freeipa/ticket/5585 Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
Diffstat (limited to 'ipaserver')
-rw-r--r--ipaserver/install/server/common.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ipaserver/install/server/common.py b/ipaserver/install/server/common.py
index 637e56643..08980c60f 100644
--- a/ipaserver/install/server/common.py
+++ b/ipaserver/install/server/common.py
@@ -138,7 +138,7 @@ class BaseServerCA(common.Installable, core.Group, core.Composite):
for rdn in dn:
if rdn.attr.lower() not in VALID_SUBJECT_ATTRS:
raise ValueError("invalid attribute: \"%s\"" % rdn.attr)
- except ValueError, e:
+ except ValueError as e:
raise ValueError("invalid subject base format: %s" % e)
ca_signing_algorithm = Knob(
@@ -243,7 +243,7 @@ class BaseServerDNS(common.Installable, core.Group, core.Composite):
encoding = 'utf-8'
value = value.decode(encoding)
bindinstance.validate_zonemgr_str(value)
- except ValueError, e:
+ except ValueError as e:
# FIXME we can do this in better way
# https://fedorahosted.org/freeipa/ticket/4804
# decode to proper stderr encoding