summaryrefslogtreecommitdiff
path: root/cloudinit/__init__.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2012-01-12 16:54:54 +0100
committerScott Moser <smoser@ubuntu.com>2012-01-12 16:54:54 +0100
commit6a2031c4dc005d9a0f42b10200b828eee5cf166f (patch)
treea57029f73b060b9e8ab6068d326f939dc479d191 /cloudinit/__init__.py
parent234cefd314a7e1cfb51fad3bdf344d801a8b238d (diff)
downloadvyos-cloud-init-6a2031c4dc005d9a0f42b10200b828eee5cf166f.tar.gz
vyos-cloud-init-6a2031c4dc005d9a0f42b10200b828eee5cf166f.zip
[PATCH 06/13] Fix pylint warnings W0612 (unused variable)
From: Juerg Haefliger <juerg.haefliger@hp.com>
Diffstat (limited to 'cloudinit/__init__.py')
-rw-r--r--cloudinit/__init__.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/cloudinit/__init__.py b/cloudinit/__init__.py
index 5460d6e1..537e3363 100644
--- a/cloudinit/__init__.py
+++ b/cloudinit/__init__.py
@@ -137,7 +137,7 @@ class CloudInit:
try:
conf = util.get_base_cfg(self.sysconfig,cfg_builtin, parsed_cfgs)
- except Exception as e:
+ except Exception:
conf = get_builtin_cfg()
# support reading the old ConfigObj format file and merging
@@ -176,7 +176,7 @@ class CloudInit:
try:
f=open(cache, "wb")
- data = cPickle.dump(self.datasource,f)
+ cPickle.dump(self.datasource,f)
f.close()
os.chmod(cache,0400)
except:
@@ -360,7 +360,7 @@ class CloudInit:
# give callbacks opportunity to finalize
called = [ ]
- for (mtype, mod) in part_handlers.iteritems():
+ for (_mtype, mod) in part_handlers.iteritems():
if mod in called:
continue
handler_call_end(mod, data, frequency)
@@ -425,7 +425,7 @@ class CloudInit:
try:
env=os.environ.copy()
env['INSTANCE_ID']= self.datasource.get_instance_id()
- ret = subprocess.check_call([filepath], env=env)
+ subprocess.check_call([filepath], env=env)
except subprocess.CalledProcessError as e:
log.error("boothooks script %s returned %i" %
(filepath,e.returncode))