From 24cc13db898e07523227d04af9a15ea90eeacc3c Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Apr 27 2020 18:59:07 +0000 Subject: Fix exception escape warning W1661(exception-escape), RPCClient.forward] Using an exception object that was bound by an except handler) Signed-off-by: Christian Heimes Reviewed-By: Alexander Bokovoy Reviewed-By: Rob Crittenden --- diff --git a/ipalib/rpc.py b/ipalib/rpc.py index 1ef0f5e..b07435e 100644 --- a/ipalib/rpc.py +++ b/ipalib/rpc.py @@ -1170,11 +1170,11 @@ class RPCClient(Connectible): try: principal = getattr(context, 'principal', None) delete_persistent_client_session_data(principal) - except Exception as e: + except Exception as e2: # This shouldn't happen if we have a session # but it isn't fatal. logger.debug("Error trying to remove persisent " - "session data: %s", e) + "session data: %s", e2) # Create a new serverproxy with the non-session URI serverproxy = self.create_connection( diff --git a/ipapython/ipaldap.py b/ipapython/ipaldap.py index f40858e..10ef89a 100644 --- a/ipapython/ipaldap.py +++ b/ipapython/ipaldap.py @@ -1567,9 +1567,9 @@ class LDAPClient: str(base_dn), scope, filter, attrs_list, serverctrls=sctrls, timeout=time_limit, sizelimit=size_limit) - except ldap.LDAPError as e: + except ldap.LDAPError as e2: logger.warning( - "Error cancelling paged search: %s", e) + "Error cancelling paged search: %s", e2) cookie = '' try: