Misc module cleanup (#1418)

- move datasource helpers to dedicated directory
- drop unnecessary executable bit on shebangless python files

11 files changed, 19 insertions, 22 deletions

diff --git a/cloudinit/cmd/clean.py b/cloudinit/cmd/clean.py
index 0e1db118..1a017608 100644..100755
--- a/cloudinit/cmd/clean.py
+++ b/cloudinit/cmd/clean.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 # Copyright (C) 2017 Canonical Ltd.
 #
 # This file is part of cloud-init. See LICENSE file for license information.
@@ -120,5 +122,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-
-# vi: ts=4 expandtab
diff --git a/cloudinit/cmd/cloud_id.py b/cloudinit/cmd/cloud_id.py
index b9c30fb4..34160f8c 100755
--- a/cloudinit/cmd/cloud_id.py
+++ b/cloudinit/cmd/cloud_id.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 # This file is part of cloud-init. See LICENSE file for license information.
 
 """Commandline utility to list the canonical cloud-id for an instance."""
@@ -111,5 +113,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-
-# vi: ts=4 expandtab
diff --git a/cloudinit/cmd/devel/__init__.py b/cloudinit/cmd/devel/__init__.py
index ead5f7a9..ead5f7a9 100644..100755
--- a/cloudinit/cmd/devel/__init__.py
+++ b/cloudinit/cmd/devel/__init__.py
diff --git a/cloudinit/cmd/devel/hotplug_hook.py b/cloudinit/cmd/devel/hotplug_hook.py
index 7f663d24..af45ed22 100644..100755
--- a/cloudinit/cmd/devel/hotplug_hook.py
+++ b/cloudinit/cmd/devel/hotplug_hook.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 # This file is part of cloud-init. See LICENSE file for license information.
 """Handle reconfiguration on hotplug events"""
 import abc
diff --git a/cloudinit/cmd/devel/logs.py b/cloudinit/cmd/devel/logs.py
index d54b809a..fbe8c500 100644..100755
--- a/cloudinit/cmd/devel/logs.py
+++ b/cloudinit/cmd/devel/logs.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 # Copyright (C) 2017 Canonical Ltd.
 #
 # This file is part of cloud-init. See LICENSE file for license information.
@@ -189,5 +191,3 @@ def main():
 
 if __name__ == "__main__":
     sys.exit(main())
-
-# vi: ts=4 expandtab
diff --git a/cloudinit/cmd/devel/make_mime.py b/cloudinit/cmd/devel/make_mime.py
index c7671a93..b1b61949 100755
--- a/cloudinit/cmd/devel/make_mime.py
+++ b/cloudinit/cmd/devel/make_mime.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 # This file is part of cloud-init. See LICENSE file for license information.
 
 """Generate multi-part mime messages for user-data """
@@ -138,6 +140,3 @@ def main():
 
 if __name__ == "__main__":
     sys.exit(main())
-
-
-# vi: ts=4 expandtab
diff --git a/cloudinit/cmd/devel/net_convert.py b/cloudinit/cmd/devel/net_convert.py
index 647fe07b..e3f58e90 100755
--- a/cloudinit/cmd/devel/net_convert.py
+++ b/cloudinit/cmd/devel/net_convert.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 # This file is part of cloud-init. See LICENSE file for license information.
 
 """Debug network config format conversions."""
@@ -179,6 +180,3 @@ def handle_args(name, args):
 if __name__ == "__main__":
     args = get_parser().parse_args()
     handle_args(NAME, args)
-
-
-# vi: ts=4 expandtab
diff --git a/cloudinit/cmd/devel/render.py b/cloudinit/cmd/devel/render.py
index 2f9a22a8..62b432d2 100755
--- a/cloudinit/cmd/devel/render.py
+++ b/cloudinit/cmd/devel/render.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 # This file is part of cloud-init. See LICENSE file for license information.
 
 """Debug jinja template rendering of user-data."""
@@ -110,6 +112,3 @@ def main():
 
 if __name__ == "__main__":
     sys.exit(main())
-
-
-# vi: ts=4 expandtab
diff --git a/cloudinit/cmd/main.py b/cloudinit/cmd/main.py
index 101ac1a4..9642dc8e 100644..100755
--- a/cloudinit/cmd/main.py
+++ b/cloudinit/cmd/main.py
@@ -1,4 +1,5 @@
-#
+#!/usr/bin/env python3
+
 # Copyright (C) 2012 Canonical Ltd.
 # Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
 # Copyright (C) 2012 Yahoo! Inc.
@@ -1099,5 +1100,3 @@ if __name__ == "__main__":
     return_value = main(sys.argv)
     if return_value:
         sys.exit(return_value)
-
-# vi: ts=4 expandtab
diff --git a/cloudinit/cmd/query.py b/cloudinit/cmd/query.py
index 46f17699..b9347200 100644..100755
--- a/cloudinit/cmd/query.py
+++ b/cloudinit/cmd/query.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 # This file is part of cloud-init. See LICENSE file for license information.
 
 """Query standardized instance metadata provided to machine, returning a JSON
@@ -317,5 +319,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-
-# vi: ts=4 expandtab
diff --git a/cloudinit/cmd/status.py b/cloudinit/cmd/status.py
index 5176549d..f3b4f161 100644..100755
--- a/cloudinit/cmd/status.py
+++ b/cloudinit/cmd/status.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 # Copyright (C) 2017 Canonical Ltd.
 #
 # This file is part of cloud-init. See LICENSE file for license information.
@@ -180,5 +182,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-
-# vi: ts=4 expandtab