1 files changed, 28 insertions, 18 deletions

diff --git a/cloudinit/UserDataHandler.py b/cloudinit/UserDataHandler.py
index 19c331be..48bd9780 100644
--- a/cloudinit/UserDataHandler.py
+++ b/cloudinit/UserDataHandler.py
@@ -26,17 +26,19 @@ import cloudinit.util as util
 import hashlib
 import urllib
 
+
 starts_with_mappings = {
-    '#include' : 'text/x-include-url',
-    '#include-once' : 'text/x-include-once-url',
-    '#!' : 'text/x-shellscript',
-    '#cloud-config' : 'text/cloud-config',
-    '#upstart-job'  : 'text/upstart-job',
-    '#part-handler' : 'text/part-handler',
-    '#cloud-boothook' : 'text/cloud-boothook',
-    '#cloud-config-archive' : 'text/cloud-config-archive',
+    '#include': 'text/x-include-url',
+    '#include-once': 'text/x-include-once-url',
+    '#!': 'text/x-shellscript',
+    '#cloud-config': 'text/cloud-config',
+    '#upstart-job': 'text/upstart-job',
+    '#part-handler': 'text/part-handler',
+    '#cloud-boothook': 'text/cloud-boothook',
+    '#cloud-config-archive': 'text/cloud-config-archive',
 }
 
+
 # if 'string' is compressed return decompressed otherwise return it
 def decomp_str(string):
     import StringIO
@@ -47,6 +49,7 @@ def decomp_str(string):
     except:
         return(string)
 
+
 def do_include(content, appendmsg):
     import os
     # is just a list of urls, one per line
@@ -67,7 +70,7 @@ def do_include(content, appendmsg):
             continue
 
         # urls cannot not have leading or trailing white space
-        msum = hashlib.md5()
+        msum = hashlib.md5()  # pylint: disable=E1101
         msum.update(line.strip())
         includeonce_filename = "%s/urlcache/%s" % (
             cloudinit.get_ipath_cur("data"), msum.hexdigest())
@@ -88,14 +91,14 @@ def do_include(content, appendmsg):
 def explode_cc_archive(archive, appendmsg):
     for ent in yaml.load(archive):
         # ent can be one of:
-        #  dict { 'filename' : 'value' , 'content' : 'value', 'type' : 'value' }
+        #  dict { 'filename' : 'value', 'content' : 'value', 'type' : 'value' }
         #    filename and type not be present
         # or
         #  scalar(payload)
-        
+
         def_type = "text/cloud-config"
         if isinstance(ent, str):
-            ent = { 'content': ent }
+            ent = {'content': ent}
 
         content = ent.get('content', '')
         mtype = ent.get('type', None)
@@ -135,6 +138,7 @@ def multi_part_count(outermsg, newcount=None):
 
     return(int(outermsg.get('Number-Attachments', 0)))
 
+
 def _attach_part(outermsg, part):
     """
     Attach an part to an outer message. outermsg must be a MIMEMultipart.
@@ -143,18 +147,20 @@ def _attach_part(outermsg, part):
     cur = multi_part_count(outermsg)
     if not part.get_filename(None):
         part.add_header('Content-Disposition', 'attachment',
-            filename = 'part-%03d' % (cur+1))
+            filename='part-%03d' % (cur + 1))
     outermsg.attach(part)
-    multi_part_count(outermsg, cur+1)
-    
+    multi_part_count(outermsg, cur + 1)
+
+
 def type_from_startswith(payload, default=None):
     # slist is sorted longest first
-    slist = sorted(starts_with_mappings.keys(), key=lambda e: 0-len(e))
+    slist = sorted(starts_with_mappings.keys(), key=lambda e: 0 - len(e))
     for sstr in slist:
         if payload.startswith(sstr):
             return(starts_with_mappings[sstr])
     return default
 
+
 def process_includes(msg, appendmsg=None):
     if appendmsg == None:
         appendmsg = MIMEMultipart()
@@ -190,6 +196,7 @@ def process_includes(msg, appendmsg=None):
 
         _attach_part(appendmsg, part)
 
+
 def message_from_string(data, headers=None):
     if headers is None:
         headers = {}
@@ -208,15 +215,17 @@ def message_from_string(data, headers=None):
 
     return(msg)
 
+
 # this is heavily wasteful, reads through userdata string input
 def preprocess_userdata(data):
     newmsg = MIMEMultipart()
     process_includes(message_from_string(decomp_str(data)), newmsg)
     return(newmsg.as_string())
 
+
 # callback is a function that will be called with (data, content_type,
 # filename, payload)
-def walk_userdata(istr, callback, data = None):
+def walk_userdata(istr, callback, data=None):
     partnum = 0
     for part in message_from_string(istr).walk():
         # multipart/* are just containers
@@ -233,7 +242,8 @@ def walk_userdata(istr, callback, data = None):
 
         callback(data, ctype, filename, part.get_payload(decode=True))
 
-        partnum = partnum+1
+        partnum = partnum + 1
+
 
 if __name__ == "__main__":
     import sys