fix pylint warnings (LP: #914739) [Juerg Haefliger]

This merge pulls in Jeurg's 'fix-pylint-warnings.tgz' patchset from
LP: #914739.

1 files changed, 6 insertions, 4 deletions

diff --git a/cloudinit/CloudConfig/cc_rightscale_userdata.py b/cloudinit/CloudConfig/cc_rightscale_userdata.py
index 2b43023c..61aa89d1 100644
--- a/cloudinit/CloudConfig/cc_rightscale_userdata.py
+++ b/cloudinit/CloudConfig/cc_rightscale_userdata.py
@@ -42,7 +42,7 @@ frequency = per_instance
 my_name = "cc_rightscale_userdata"
 my_hookname = 'CLOUD_INIT_REMOTE_HOOK'
 
-def handle(_name,_cfg,cloud,log,_args):
+def handle(_name, _cfg, cloud, log, _args):
     try:
         ud = cloud.get_userdata_raw()
     except:
@@ -51,7 +51,8 @@ def handle(_name,_cfg,cloud,log,_args):
 
     try:
         mdict = parse_qs(ud)
-        if not my_hookname in mdict: return
+        if not my_hookname in mdict:
+            return
     except:
         log.warn("failed to urlparse.parse_qa(userdata_raw())")
         raise
@@ -60,13 +61,14 @@ def handle(_name,_cfg,cloud,log,_args):
     i = 0
     first_e = None
     for url in mdict[my_hookname]:
-        fname = "%s/rightscale-%02i" % (scripts_d,i)
+        fname = "%s/rightscale-%02i" % (scripts_d, i)
         i = i +1
         try:
             content = util.readurl(url)
             util.write_file(fname, content, mode=0700)
         except Exception as e:
-            if not first_e: first_e = None
+            if not first_e:
+                first_e = None
             log.warn("%s failed to read %s: %s" % (my_name, url, e))
             
     if first_e: