summaryrefslogtreecommitdiff
path: root/cloudinit/UserDataHandler.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/UserDataHandler.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/UserDataHandler.py')
-rw-r--r--cloudinit/UserDataHandler.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/cloudinit/UserDataHandler.py b/cloudinit/UserDataHandler.py
index ac2cdda9..0afe5a18 100644
--- a/cloudinit/UserDataHandler.py
+++ b/cloudinit/UserDataHandler.py
@@ -77,7 +77,7 @@ def do_include(content, appendmsg):
content = urllib.urlopen(line).read()
if includeonce:
util.write_file(includeonce_filename, content, mode=0600)
- except Exception as e:
+ except Exception:
raise
process_includes(message_from_string(decomp_str(content)), appendmsg)
@@ -190,7 +190,6 @@ def process_includes(msg, appendmsg=None):
def message_from_string(data, headers={}):
if "mime-version:" in data[0:4096].lower():
- was_mime = True
msg = email.message_from_string(data)
for (key,val) in headers.items():
if key in msg:
@@ -198,7 +197,6 @@ def message_from_string(data, headers={}):
else:
msg[key] = val
else:
- was_mime = False
mtype = headers.get("Content-Type","text/plain")
maintype, subtype = mtype.split("/", 1)
msg = MIMEBase(maintype, subtype, *headers)