[PATCH 3/4] Fix pylint conventions C0324 (comma not followed by a space)

From: Juerg Haefliger <juerg.haefliger@hp.com>

1 files changed, 21 insertions, 21 deletions

diff --git a/cloudinit/CloudConfig/__init__.py b/cloudinit/CloudConfig/__init__.py
index fb390090..caf7e333 100644
--- a/cloudinit/CloudConfig/__init__.py
+++ b/cloudinit/CloudConfig/__init__.py
@@ -33,7 +33,7 @@ class CloudConfig():
     cfgfile = None
     cfg = None
 
-    def __init__(self,cfgfile, cloud=None, ds_deps=None):
+    def __init__(self, cfgfile, cloud=None, ds_deps=None):
         if cloud == None:
             self.cloud = cloudinit.CloudInit(ds_deps)
             self.cloud.get_data_source()
@@ -41,7 +41,7 @@ class CloudConfig():
             self.cloud = cloud
         self.cfg = self.get_config_obj(cfgfile)
 
-    def get_config_obj(self,cfgfile):
+    def get_config_obj(self, cfgfile):
         try:
             cfg = util.read_conf(cfgfile)
         except:
@@ -58,12 +58,12 @@ class CloudConfig():
             ds_cfg = { }
 
         cfg = util.mergedict(cfg, ds_cfg)
-        return(util.mergedict(cfg,self.cloud.cfg))
+        return(util.mergedict(cfg, self.cloud.cfg))
 
     def handle(self, name, args, freq=None):
         try:
-            mod = __import__("cc_" + name.replace("-","_"),globals())
-            def_freq = getattr(mod, "frequency",per_instance)
+            mod = __import__("cc_" + name.replace("-", "_"), globals())
+            def_freq = getattr(mod, "frequency", per_instance)
             handler = getattr(mod, "handle")
 
             if not freq:
@@ -76,7 +76,7 @@ class CloudConfig():
 
 # reads a cloudconfig module list, returns
 # a 2 dimensional array suitable to pass to run_cc_modules
-def read_cc_modules(cfg,name):
+def read_cc_modules(cfg, name):
     if name not in cfg:
         return([])
     module_list = []
@@ -85,15 +85,15 @@ def read_cc_modules(cfg,name):
     #       array[1] = freq
     #       array[2:] = arguemnts
     for item in cfg[name]:
-        if isinstance(item,str):
+        if isinstance(item, str):
             module_list.append((item,))
-        elif isinstance(item,list):
+        elif isinstance(item, list):
             module_list.append(item)
         else:
             raise TypeError("failed to read '%s' item in config")
     return(module_list)
     
-def run_cc_modules(cc,module_list,log):
+def run_cc_modules(cc, module_list, log):
     failures = []
     for cfg_mod in module_list:
         name = cfg_mod[0]
@@ -111,7 +111,7 @@ def run_cc_modules(cc,module_list,log):
         except:
             log.warn(traceback.format_exc())
             log.error("config handling of %s, %s, %s failed\n" %
-                (name,freq,run_args))
+                (name, freq, run_args))
             failures.append(name)
 
     return(failures)
@@ -142,11 +142,11 @@ def get_output_cfg(cfg, mode="init"):
         modecfg = outcfg['all']
 
     # if value is a string, it specifies stdout and stderr
-    if isinstance(modecfg,str):
+    if isinstance(modecfg, str):
         ret = [ modecfg, modecfg ]
 
     # if its a list, then we expect (stdout, stderr)
-    if isinstance(modecfg,list):
+    if isinstance(modecfg, list):
         if len(modecfg) > 0:
             ret[0] = modecfg[0]
         if len(modecfg) > 1:
@@ -173,7 +173,7 @@ def get_output_cfg(cfg, mode="init"):
         found = False
         for s in swlist:
             if val.startswith(s):
-                val = "%s %s" % (s,val[len(s):].strip())
+                val = "%s %s" % (s, val[len(s):].strip())
                 found = True
                 break
         if not found:
@@ -193,9 +193,9 @@ def get_output_cfg(cfg, mode="init"):
 #
 #   with a '|', arguments are passed to shell, so one level of
 #   shell escape is required.  
-def redirect_output(outfmt,errfmt, o_out=sys.stdout, o_err=sys.stderr):
+def redirect_output(outfmt, errfmt, o_out=sys.stdout, o_err=sys.stderr):
     if outfmt:
-        (mode, arg) = outfmt.split(" ",1)
+        (mode, arg) = outfmt.split(" ", 1)
         if mode == ">" or mode == ">>":
             owith = "ab"
             if mode == ">":
@@ -214,7 +214,7 @@ def redirect_output(outfmt,errfmt, o_out=sys.stdout, o_err=sys.stderr):
             return
 
     if errfmt:
-        (mode, arg) = errfmt.split(" ",1)
+        (mode, arg) = errfmt.split(" ", 1)
         if mode == ">" or mode == ">>":
             owith = "ab"
             if mode == ">":
@@ -231,11 +231,11 @@ def redirect_output(outfmt,errfmt, o_out=sys.stdout, o_err=sys.stderr):
     return
 
 def run_per_instance(name, func, args, clear_on_fail=False):
-    semfile = "%s/%s" % (cloudinit.get_ipath_cur("data"),name)
+    semfile = "%s/%s" % (cloudinit.get_ipath_cur("data"), name)
     if os.path.exists(semfile):
         return
 
-    util.write_file(semfile,str(time.time()))
+    util.write_file(semfile, str(time.time()))
     try:
         func(*args)
     except:
@@ -244,7 +244,7 @@ def run_per_instance(name, func, args, clear_on_fail=False):
         raise
 
 # apt_get top level command (install, update...), and args to pass it
-def apt_get(tlc,args=None):
+def apt_get(tlc, args=None):
     if args is None:
         args = []
     e = os.environ.copy()
@@ -252,11 +252,11 @@ def apt_get(tlc,args=None):
     cmd = ['apt-get', '--option', 'Dpkg::Options::=--force-confold',
            '--assume-yes', tlc]
     cmd.extend(args)
-    subprocess.check_call(cmd,env=e)
+    subprocess.check_call(cmd, env=e)
 
 def update_package_sources():
     run_per_instance("update-sources", apt_get, ("update",))
 
 def install_packages(pkglist):
     update_package_sources()
-    apt_get("install",pkglist)
+    apt_get("install", pkglist)