py3: Remove py3 incompatible exception handling

https://fedorahosted.org/freeipa/ticket/5585

Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
This commit is contained in:
Tomas Babej 2016-01-08 18:23:35 +01:00 committed by Martin Basti
parent 00c13fd340
commit 50627004b8
3 changed files with 5 additions and 5 deletions

View File

@ -752,9 +752,9 @@ def run(api):
except KeyboardInterrupt:
print ''
api.log.info('operation aborted')
except PublicError, e:
except PublicError as e:
error = e
except Exception, e:
except Exception as e:
api.log.exception('%s: %s', e.__class__.__name__, str(e))
error = InternalError()
if error is not None:

View File

@ -13,7 +13,7 @@ env._finalize_core(**dict(DEFAULT_CONFIG))
api.bootstrap(context='server', debug=env.debug, log=None) (ref:wsgi-app-bootstrap)
try:
api.finalize() (ref:wsgi-app-finalize)
except Exception, e:
except Exception as e:
api.log.error('Failed to start IPA: %s' % e)
else:
api.log.info('*** PROCESS START ***')

View File

@ -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