remove occurences of pylint W0621 (Redefining name xyz from outer scope)

3 files changed, 62 insertions, 52 deletions

diff --git a/cloudinit/DataSourceOVF.py b/cloudinit/DataSourceOVF.py
index 02c85f73..1a527524 100644
--- a/cloudinit/DataSourceOVF.py
+++ b/cloudinit/DataSourceOVF.py
@@ -312,16 +312,19 @@ def get_datasource_list(depends):
 
 
 if __name__ == "__main__":
-    import sys
-    envStr = open(sys.argv[1]).read()
-    props = getProperties(envStr)
-    import pprint
-    pprint.pprint(props)
-
-    md, ud, cfg = read_ovf_environment(envStr)
-    print "=== md ==="
-    pprint.pprint(md)
-    print "=== ud ==="
-    pprint.pprint(ud)
-    print "=== cfg ==="
-    pprint.pprint(cfg)
+    def main():
+        import sys
+        envStr = open(sys.argv[1]).read()
+        props = getProperties(envStr)
+        import pprint
+        pprint.pprint(props)
+
+        md, ud, cfg = read_ovf_environment(envStr)
+        print "=== md ==="
+        pprint.pprint(md)
+        print "=== ud ==="
+        pprint.pprint(ud)
+        print "=== cfg ==="
+        pprint.pprint(cfg)
+
+    main()
diff --git a/cloudinit/SshUtil.py b/cloudinit/SshUtil.py
index c6c30c5c..9db0c6b4 100644
--- a/cloudinit/SshUtil.py
+++ b/cloudinit/SshUtil.py
@@ -156,39 +156,6 @@ def setup_user_keys(keys, user, key_prefix, log=None):
     os.umask(saved_umask)
 
 
-if __name__ == "__main__":
-    import sys
-    # usage: orig_file, new_keys, [key_prefix]
-    #   prints out merged, where 'new_keys' will trump old
-    ##  example
-    ## ### begin auth_keys ###
-    # ssh-rsa AAAAB3NzaC1xxxxxxxxxV3csgm8cJn7UveKHkYjJp8= smoser-work
-    # ssh-rsa AAAAB3NzaC1xxxxxxxxxCmXp5Kt5/82cD/VN3NtHw== smoser@brickies
-    # ### end authorized_keys ###
-    #
-    # ### begin new_keys ###
-    # ssh-rsa nonmatch smoser@newhost
-    # ssh-rsa AAAAB3NzaC1xxxxxxxxxV3csgm8cJn7UveKHkYjJp8= new_comment
-    # ### end new_keys ###
-    #
-    # Then run as:
-    #  program auth_keys new_keys \
-    #      'no-port-forwarding,command=\"echo hi world;\"'
-    def_prefix = None
-    orig_key_file = sys.argv[1]
-    new_key_file = sys.argv[2]
-    if len(sys.argv) > 3:
-        def_prefix = sys.argv[3]
-    fp = open(new_key_file)
-
-    newkeys = []
-    for line in fp.readlines():
-        newkeys.append(AuthKeyEntry(line, def_prefix))
-
-    fp.close()
-    print update_authorized_keys(orig_key_file, newkeys)
-
-
 def parse_ssh_config(fname="/etc/ssh/sshd_config"):
     ret = {}
     fp = open(fname)
@@ -200,3 +167,40 @@ def parse_ssh_config(fname="/etc/ssh/sshd_config"):
         ret[key] = val
     fp.close()
     return(ret)
+
+if __name__ == "__main__":
+    def main():
+        import sys
+        # usage: orig_file, new_keys, [key_prefix]
+        #   prints out merged, where 'new_keys' will trump old
+        ##  example
+        ## ### begin auth_keys ###
+        # ssh-rsa AAAAB3NzaC1xxxxxxxxxV3csgm8cJn7UveKHkYjJp8= smoser-work
+        # ssh-rsa AAAAB3NzaC1xxxxxxxxxCmXp5Kt5/82cD/VN3NtHw== smoser@brickies
+        # ### end authorized_keys ###
+        #
+        # ### begin new_keys ###
+        # ssh-rsa nonmatch smoser@newhost
+        # ssh-rsa AAAAB3NzaC1xxxxxxxxxV3csgm8cJn7UveKHkYjJp8= new_comment
+        # ### end new_keys ###
+        #
+        # Then run as:
+        #  program auth_keys new_keys \
+        #      'no-port-forwarding,command=\"echo hi world;\"'
+        def_prefix = None
+        orig_key_file = sys.argv[1]
+        new_key_file = sys.argv[2]
+        if len(sys.argv) > 3:
+            def_prefix = sys.argv[3]
+        fp = open(new_key_file)
+
+        newkeys = []
+        for line in fp.readlines():
+            newkeys.append(AuthKeyEntry(line, def_prefix))
+
+        fp.close()
+        print update_authorized_keys(orig_key_file, newkeys)
+
+    main()
+
+# vi: ts=4 expandtab
diff --git a/cloudinit/UserDataHandler.py b/cloudinit/UserDataHandler.py
index 48bd9780..9331aa17 100644
--- a/cloudinit/UserDataHandler.py
+++ b/cloudinit/UserDataHandler.py
@@ -246,9 +246,12 @@ def walk_userdata(istr, callback, data=None):
 
 
 if __name__ == "__main__":
-    import sys
-    data = decomp_str(file(sys.argv[1]).read())
-    newmsg = MIMEMultipart()
-    process_includes(message_from_string(data), newmsg)
-    print newmsg
-    print "#found %s parts" % multi_part_count(newmsg)
+    def main():
+        import sys
+        data = decomp_str(file(sys.argv[1]).read())
+        newmsg = MIMEMultipart()
+        process_includes(message_from_string(data), newmsg)
+        print newmsg
+        print "#found %s parts" % multi_part_count(newmsg)
+
+    main()