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

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

1 files changed, 31 insertions, 24 deletions

diff --git a/cloudinit/CloudConfig/cc_apt_update_upgrade.py b/cloudinit/CloudConfig/cc_apt_update_upgrade.py
index 0cbe02d4..dea89d25 100644
--- a/cloudinit/CloudConfig/cc_apt_update_upgrade.py
+++ b/cloudinit/CloudConfig/cc_apt_update_upgrade.py
@@ -22,7 +22,7 @@ import os
 import glob
 import cloudinit.CloudConfig as cc
 
-def handle(_name,cfg,cloud,log,_args):
+def handle(_name, cfg, cloud, log, _args):
     update = util.get_cfg_option_bool(cfg, 'apt_update', False)
     upgrade = util.get_cfg_option_bool(cfg, 'apt_upgrade', False)
 
@@ -35,7 +35,7 @@ def handle(_name,cfg,cloud,log,_args):
     if not util.get_cfg_option_bool(cfg, \
         'apt_preserve_sources_list', False):
         generate_sources_list(release, mirror)
-        old_mir = util.get_cfg_option_str(cfg,'apt_old_mirror', \
+        old_mir = util.get_cfg_option_str(cfg, 'apt_old_mirror', \
             "archive.ubuntu.com/ubuntu")
         rename_apt_lists(old_mir, mirror)
 
@@ -46,7 +46,7 @@ def handle(_name,cfg,cloud,log,_args):
     if proxy:
         try:
             contents = "Acquire::HTTP::Proxy \"%s\";\n"
-            with open(proxy_filename,"w") as fp:
+            with open(proxy_filename, "w") as fp:
                 fp.write(contents % proxy)
         except Exception as e:
             log.warn("Failed to write proxy to %s" % proxy_filename)
@@ -69,7 +69,7 @@ def handle(_name,cfg,cloud,log,_args):
             log.error("Failed to run debconf-set-selections")
             log.debug(traceback.format_exc())
 
-    pkglist = util.get_cfg_option_list_or_str(cfg,'packages',[])
+    pkglist = util.get_cfg_option_list_or_str(cfg, 'packages', [])
 
     errors = [ ]
     if update or len(pkglist) or upgrade:
@@ -102,26 +102,29 @@ def handle(_name,cfg,cloud,log,_args):
     return(True)
 
 def mirror2lists_fileprefix(mirror):
-    string=mirror
+    string = mirror
     # take of http:// or ftp://
-    if string.endswith("/"): string=string[0:-1]
-    pos=string.find("://")
+    if string.endswith("/"):
+        string = string[0:-1]
+    pos = string.find("://")
     if pos >= 0:
-        string=string[pos+3:]
-    string=string.replace("/","_")
+        string = string[pos+3:]
+    string = string.replace("/", "_")
     return string
 
-def rename_apt_lists(omirror,new_mirror,lists_d="/var/lib/apt/lists"):
+def rename_apt_lists(omirror, new_mirror, lists_d="/var/lib/apt/lists"):
     
-    oprefix="%s/%s" % (lists_d,mirror2lists_fileprefix(omirror))
-    nprefix="%s/%s" % (lists_d,mirror2lists_fileprefix(new_mirror))
-    if(oprefix==nprefix): return
-    olen=len(oprefix)
+    oprefix = "%s/%s" % (lists_d, mirror2lists_fileprefix(omirror))
+    nprefix = "%s/%s" % (lists_d, mirror2lists_fileprefix(new_mirror))
+    if(oprefix == nprefix):
+        return
+    olen = len(oprefix)
     for filename in glob.glob("%s_*" % oprefix):
-        os.rename(filename,"%s%s" % (nprefix, filename[olen:]))
+        os.rename(filename, "%s%s" % (nprefix, filename[olen:]))
 
 def get_release():
-    stdout, _stderr = subprocess.Popen(['lsb_release', '-cs'], stdout=subprocess.PIPE).communicate()
+    stdout, _stderr = subprocess.Popen(['lsb_release', '-cs'],
+                                       stdout=subprocess.PIPE).communicate()
     return(stdout.strip())
 
 def generate_sources_list(codename, mirror):
@@ -141,9 +144,10 @@ def add_sources(srclist, searchList=None):
             elst.append([ "", "missing source" ])
             continue
 
-        source=ent['source']
+        source = ent['source']
         if source.startswith("ppa:"):
-            try: util.subp(["add-apt-repository",source])
+            try:
+                util.subp(["add-apt-repository", source])
             except:
                 elst.append([source, "add-apt-repository failed"])
             continue
@@ -151,7 +155,7 @@ def add_sources(srclist, searchList=None):
         source = util.render_string(source, searchList)
 
         if not ent.has_key('filename'):
-            ent['filename']='cloud_config_sources.list'
+            ent['filename'] = 'cloud_config_sources.list'
 
         if not ent['filename'].startswith("/"):
             ent['filename'] = "%s/%s" % \
@@ -159,19 +163,22 @@ def add_sources(srclist, searchList=None):
 
         if ( ent.has_key('keyid') and not ent.has_key('key') ):
             ks = "keyserver.ubuntu.com"
-            if ent.has_key('keyserver'): ks = ent['keyserver']
+            if ent.has_key('keyserver'):
+                ks = ent['keyserver']
             try:
                 ent['key'] = util.getkeybyid(ent['keyid'], ks)
             except:
-                elst.append([source,"failed to get key from %s" % ks])
+                elst.append([source, "failed to get key from %s" % ks])
                 continue
 
         if ent.has_key('key'):
-            try: util.subp(('apt-key', 'add', '-'), ent['key'])
+            try:
+                util.subp(('apt-key', 'add', '-'), ent['key'])
             except:
                 elst.append([source, "failed add key"])
 
-        try: util.write_file(ent['filename'], source + "\n", omode="ab")
+        try:
+            util.write_file(ent['filename'], source + "\n", omode="ab")
         except:
             elst.append([source, "failed write to file %s" % ent['filename']])
 
@@ -189,7 +196,7 @@ def find_apt_mirror(cloud, cfg):
     }
     mirror = None
 
-    cfg_mirror = cfg.get("apt_mirror",None)
+    cfg_mirror = cfg.get("apt_mirror", None)
     if cfg_mirror:
         mirror = cfg["apt_mirror"]
     elif cfg.has_key("apt_mirror_search"):