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

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

1 files changed, 18 insertions, 12 deletions

diff --git a/cloudinit/CloudConfig/cc_ssh.py b/cloudinit/CloudConfig/cc_ssh.py
index 0aad2187..b6ac1edb 100644
--- a/cloudinit/CloudConfig/cc_ssh.py
+++ b/cloudinit/CloudConfig/cc_ssh.py
@@ -21,20 +21,24 @@ import os
 import glob
 import subprocess
 
-DISABLE_ROOT_OPTS="no-port-forwarding,no-agent-forwarding,no-X11-forwarding,command=\"echo \'Please login as the user \\\"$USER\\\" rather than the user \\\"root\\\".\';echo;sleep 10\""
+DISABLE_ROOT_OPTS = "no-port-forwarding,no-agent-forwarding," \
+"no-X11-forwarding,command=\"echo \'Please login as the user \\\"$USER\\\" " \
+"rather than the user \\\"root\\\".\';echo;sleep 10\""
 
 
 global_log = None
 
-def handle(_name,cfg,cloud,log,_args):
+def handle(_name, cfg, cloud, log, _args):
     global global_log
     global_log = log
 
     # remove the static keys from the pristine image
     if cfg.get("ssh_deletekeys", True):
         for f in glob.glob("/etc/ssh/ssh_host_*key*"):
-            try: os.unlink(f)
-            except: pass
+            try:
+                os.unlink(f)
+            except:
+                pass
 
     if cfg.has_key("ssh_keys"):
         # if there are keys in cloud-config, use them
@@ -47,17 +51,18 @@ def handle(_name,cfg,cloud,log,_args):
             "ecdsa_public"  : ("/etc/ssh/ssh_host_ecdsa_key.pub", 0644),
         }
 
-        for key,val in cfg["ssh_keys"].items():
+        for key, val in cfg["ssh_keys"].items():
             if key2file.has_key(key):
-                util.write_file(key2file[key][0],val,key2file[key][1])
+                util.write_file(key2file[key][0], val, key2file[key][1])
 
         priv2pub = { 'rsa_private':'rsa_public', 'dsa_private':'dsa_public',
             'ecdsa_private': 'ecdsa_public', }
 
         cmd = 'o=$(ssh-keygen -yf "%s") && echo "$o" root@localhost > "%s"'
-        for priv,pub in priv2pub.iteritems():
-            if pub in cfg['ssh_keys'] or not priv in cfg['ssh_keys']: continue
-            pair=(key2file[priv][0], key2file[pub][0])
+        for priv, pub in priv2pub.iteritems():
+            if pub in cfg['ssh_keys'] or not priv in cfg['ssh_keys']:
+                continue
+            pair = (key2file[priv][0], key2file[pub][0])
             subprocess.call(('sh', '-xc', cmd % pair))
             log.debug("generated %s from %s" % pair)
     else:
@@ -72,7 +77,7 @@ def handle(_name,cfg,cloud,log,_args):
     util.restorecon_if_possible('/etc/ssh', recursive=True)
 
     try:
-        user = util.get_cfg_option_str(cfg,'user')
+        user = util.get_cfg_option_str(cfg, 'user')
         disable_root = util.get_cfg_option_bool(cfg, "disable_root", True)
         disable_root_opts = util.get_cfg_option_str(cfg, "disable_root_opts",
             DISABLE_ROOT_OPTS)
@@ -82,12 +87,13 @@ def handle(_name,cfg,cloud,log,_args):
             cfgkeys = cfg["ssh_authorized_keys"]
             keys.extend(cfgkeys)
 
-        apply_credentials(keys,user,disable_root, disable_root_opts)
+        apply_credentials(keys, user, disable_root, disable_root_opts)
     except:
         util.logexc(log)
         log.warn("applying credentials failed!\n")
 
-def apply_credentials(keys, user, disable_root, disable_root_opts=DISABLE_ROOT_OPTS, log=global_log):
+def apply_credentials(keys, user, disable_root,
+                      disable_root_opts=DISABLE_ROOT_OPTS, log=global_log):
     keys = set(keys)
     if user:
         sshutil.setup_user_keys(keys, user, '', log)