From 6a2031c4dc005d9a0f42b10200b828eee5cf166f Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Thu, 12 Jan 2012 16:54:54 +0100 Subject: [PATCH 06/13] Fix pylint warnings W0612 (unused variable) From: Juerg Haefliger --- cloudinit/DataSourceEc2.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'cloudinit/DataSourceEc2.py') diff --git a/cloudinit/DataSourceEc2.py b/cloudinit/DataSourceEc2.py index eed310c9..9191e647 100644 --- a/cloudinit/DataSourceEc2.py +++ b/cloudinit/DataSourceEc2.py @@ -89,7 +89,7 @@ class DataSourceEc2(DataSource.DataSource): max_wait = 120 try: max_wait = int(mcfg.get("max_wait",max_wait)) - except Exception as e: + except Exception: util.logexc(log) log.warn("Failed to get max wait. using %s" % max_wait) @@ -99,7 +99,7 @@ class DataSourceEc2(DataSource.DataSource): timeout = 50 try: timeout = int(mcfg.get("timeout",timeout)) - except Exception as e: + except Exception: util.logexc(log) log.warn("Failed to get timeout, using %s" % timeout) @@ -226,7 +226,6 @@ def wait_for_metadata_service(urls, max_wait=None, timeout=None, status_cb=None) starttime = time.time() sleeptime = 1 - timeout_orig = timeout if status_cb == None: def status_cb(msg): return -- cgit v1.2.3