From 50627004b83fe155767fb02b51099eba612a5855 Mon Sep 17 00:00:00 2001 From: Tomas Babej Date: Fri, 8 Jan 2016 18:23:35 +0100 Subject: py3: Remove py3 incompatible exception handling https://fedorahosted.org/freeipa/ticket/5585 Reviewed-By: Martin Babinsky --- ipaserver/install/server/common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ipaserver') 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 -- cgit