a few more shebangs or calls to python

diff --git a/doc/DocBookLocal.py b/doc/DocBookLocal.py
index c697c3d..7e22c1b 100755 (executable)
--- a/doc/DocBookLocal.py
+++ b/doc/DocBookLocal.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3

 
 # PATHS to be set by the build system
 # this is in ..
 
 # PATHS to be set by the build system
 # this is in ..


@@ -11,7 +11,7 @@ def api_methods():
     for func in dir(api_calls):
         try:
             f = api_calls.__getattribute__(func)
     for func in dir(api_calls):
         try:
             f = api_calls.__getattribute__(func)

-            if 'group' in list(f.__dict__.keys()):
+            if 'group' in f.__dict__:

                 api_function_list += [api_calls.__getattribute__(func)]
         except:
             pass
                 api_function_list += [api_calls.__getattribute__(func)]
         except:
             pass

diff --git a/plugins/privatebridge.py b/plugins/privatebridge.py
index 7938c48..748d392 100644 (file)
--- a/plugins/privatebridge.py
+++ b/plugins/privatebridge.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3

 
 """ Private Bridge configurator.  """
 
 
 """ Private Bridge configurator.  """
 


@@ -66,8 +66,8 @@ def log_call_read(command, timeout=logger.default_timeout_minutes*60, poll=1):
     return (-1, None)
 
 ### Thierry - 23 Sept 2014
     return (-1, None)
 
 ### Thierry - 23 Sept 2014

-# regardless of this being shipped on lxc-only or on all nodes, 
-# it is safer to check for the availability of the ovs-vsctl command and just print 
+# regardless of this being shipped on lxc-only or on all nodes,
+# it is safer to check for the availability of the ovs-vsctl command and just print

 # out a warning when it's not there, instead of a nasty traceback
 def ovs_available ():
     "return True if ovs-vsctl can be run"
 # out a warning when it's not there, instead of a nasty traceback
 def ovs_available ():
     "return True if ovs-vsctl can be run"


@@ -202,6 +202,3 @@ def GetSlivers(data, conf = None, plc = None):
         logger.log("privatebridge: deleting unused bridge %s" % bridge_name)
 
         ovs_delbridge(bridge_name)
         logger.log("privatebridge: deleting unused bridge %s" % bridge_name)
 
         ovs_delbridge(bridge_name)

-
-
-

diff --git a/systemd/conf_files.service b/systemd/conf_files.service
index 5d36700..1eb106e 100644 (file)
--- a/systemd/conf_files.service
+++ b/systemd/conf_files.service
@@ -4,7 +4,7 @@ Before=lxc-sliceimage.service
 
 [Service]
 Type=oneshot
 
 [Service]
 Type=oneshot

-ExecStart=/usr/bin/env python /usr/share/NodeManager/conf_files.py
+ExecStart=/usr/bin/env python3 /usr/share/NodeManager/conf_files.py

 
 [Install]
 WantedBy=multi-user.target
 
 [Install]
 WantedBy=multi-user.target