From 12c714b0b1d497841763e8111271a4a9c790291e Mon Sep 17 00:00:00 2001 From: Julien Vey Date: Mon, 9 Jun 2014 14:15:16 +0200 Subject: [PATCH] Delete undeclared variable in guest-agent API class The commit c7d93e7ce74c20a9c59ee0d2d542ed5b54d9c39c (not linked to a gerrit review) introduced a local variable "timeout", used in a method of the API class The review I9ad1b441eca855a4304454014ae746ec51bef8f3 deleted the declaration of this variable but did not remove where it was used in the class. This patch removes the unused variable. Closes-Bug: #1332333 Change-Id: Ie7aa66ceeca4efe63d91d60bcedb760ec181d443 --- trove/guestagent/api.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/trove/guestagent/api.py b/trove/guestagent/api.py index b416583560..8b82079444 100644 --- a/trove/guestagent/api.py +++ b/trove/guestagent/api.py @@ -59,11 +59,8 @@ class API(proxy.RpcProxy): except Exception as e: LOG.error(e) raise exception.GuestError(original_message=str(e)) - except Timeout as t: - if t is not timeout: - raise - else: - raise exception.GuestTimeout() + except Timeout: + raise exception.GuestTimeout() def _cast(self, method_name, **kwargs): LOG.debug("Casting %s" % method_name)