From 27dabb45282911e375336f75934af9dd6cc5d963 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Thu, 30 Jul 2015 16:49:29 +0200 Subject: Modernize 'except' clauses The 'as' syntax works from Python 2 on, and Python 3 will drop the "comma" syntax. Reviewed-By: Tomas Babej --- ipapython/certmonger.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ipapython/certmonger.py') diff --git a/ipapython/certmonger.py b/ipapython/certmonger.py index 3a2907d83..1371c215d 100644 --- a/ipapython/certmonger.py +++ b/ipapython/certmonger.py @@ -212,7 +212,7 @@ def get_request_value(request_id, directive): """ try: request = _get_request(dict(nickname=request_id)) - except RuntimeError, e: + except RuntimeError as e: root_logger.error('Failed to get request: %s' % e) raise if request: @@ -240,7 +240,7 @@ def get_request_id(criteria): """ try: request = _get_request(criteria) - except RuntimeError, e: + except RuntimeError as e: root_logger.error('Failed to get request: %s' % e) raise if request: @@ -270,7 +270,7 @@ def add_request_value(request_id, directive, value): """ try: request = _get_request({'nickname': request_id}) - except RuntimeError, e: + except RuntimeError as e: root_logger.error('Failed to get request: %s' % e) raise if request: @@ -356,7 +356,7 @@ def start_tracking(nickname, secdir, password_file=None, command=None): if result[0]: request = _cm_dbus_object(cm.bus, cm, result[1], DBUS_CM_REQUEST_IF, DBUS_CM_IF, True) - except TypeError, e: + except TypeError as e: root_logger.error('Failed to add new request.') raise return request.prop_if.Get(DBUS_CM_REQUEST_IF, 'nickname') @@ -378,7 +378,7 @@ def stop_tracking(secdir, request_id=None, nickname=None): criteria['cert-nickname'] = nickname try: request = _get_request(criteria) - except RuntimeError, e: + except RuntimeError as e: root_logger.error('Failed to get request: %s' % e) raise if request: -- cgit