Update the python scripts to be python3-compatible

Author: civerachb-cpr

scripts/mutate_files

@@ -31,7 +31,7 @@ while the majority of the installation process occurs as the unprivileged user.
 import os, pickle, sys
 
 if len(sys.argv) != 2:
-    print "This script is not intended to be called manually."
+    print ("This script is not intended to be called manually.")
     exit(1)
 
 installation_files = pickle.loads(sys.argv[1])
@@ -42,32 +42,32 @@ paths = set([os.path.dirname(filename) for filename in installation_files.keys()
 for path in paths:
     if os.path.exists(path):
         if not os.access(path, os.W_OK | os.X_OK):
-            print "Unable to write to path: %s" % path
+            print ("Unable to write to path: %s" % path)
             exit(1)
     else:
         try:
             os.makedirs(path)
         except:
-            print "Unable to create path: %s" % path
+            print ("Unable to create path: %s" % path)
 
 # Mutate files according to the provided spec. We sort the list in reverse length
 # order so that when we are trying to remove a directory it is after everything in
 # it has already been removed.
-paths = installation_files.keys()
+paths = list(installation_files.keys())
 paths.sort(key=len, reverse=True)
 for path in paths:
     recipe = installation_files[path]
 
     if 'symlink' in recipe:
         try:
             os.symlink(recipe['symlink'], path)
-        except OSError, e:
+        except OSError as e:
             # In case the symlink already exists, remove it before creating
             if e.errno == 17:
                 os.unlink(path)
                 os.symlink(recipe['symlink'], path)
             else:
-                print "Unable to create symlink: %s" % path
+                print ("Unable to create symlink: %s" % path)
 
     if 'content' in recipe:
         with open(path, 'w') as f:
@@ -81,7 +81,7 @@ for path in paths:
             try:
                 os.rmdir(path)
             except OSError:
-                print "WARNING: Unable to remove directory %s. Additional user-added files may be present." % path
+                print ("WARNING: Unable to remove directory %s. Additional user-added files may be present." % path)
         else:
             os.remove(path)
 

src/robot_upstart/install_script.py

@@ -28,7 +28,7 @@
 import robot_upstart
 from catkin.find_in_workspaces import find_in_workspaces
 
-import providers
+from . import providers
 
 DESC_PKGPATH = ("Make sure the path starts with the package name"
                 " (e.g. don't pass absolute path nor a path starting from"
@@ -97,7 +97,7 @@ def main():
 
         found_path = find_in_workspaces(project=pkg, path=pkgpath, first_match_only=True)
         if not found_path:
-            print "Unable to locate path %s in package %s. Installation aborted." % (pkgpath, pkg)
+            print ("Unable to locate path %s in package %s. Installation aborted." % (pkgpath, pkg))
             return 1
 
         if os.path.isfile(found_path[0]):

src/robot_upstart/job.py

@@ -33,7 +33,7 @@
 
 from catkin.find_in_workspaces import find_in_workspaces
 
-import providers
+from . import providers
 
 
 class Job(object):
@@ -163,7 +163,7 @@ def install(self, root="/", sudo="/usr/bin/sudo", Provider=None):
 
         print "Preparing to install files to the following paths:"
         for filename in sorted(installation_files.keys()):
-            print "  %s" % filename
+            print ("  %s" % filename)
 
         self._call_mutate(sudo, installation_files)
         p.post_install()
@@ -186,11 +186,11 @@ def uninstall(self, root="/", sudo="/usr/bin/sudo", Provider=None):
         installation_files = p.generate_uninstall()
 
         if len(installation_files) == 0:
-            print "Job not found, nothing to remove."
+            print ("Job not found, nothing to remove.")
         else:
             print "Preparing to remove the following paths:"
             for filename in sorted(installation_files.keys()):
-                print "  %s" % filename
+                print ("  %s" % filename)
 
             self._call_mutate(sudo, installation_files)
 
@@ -208,13 +208,13 @@ def _call_mutate(self, sudo, installation_files):
         cmd = [mutate_files_exec]
         if sudo:
             cmd.insert(0, sudo)
-        print "Now calling: %s" % ' '.join(cmd)
+        print ("Now calling: %s" % ' '.join(cmd))
         p = subprocess.Popen(cmd + [pickle.dumps(installation_files)])
         p.communicate()
 
         if p.returncode == 0:
-            print "Filesystem operation succeeded."
+            print ("Filesystem operation succeeded.")
         else:
-            print "Error encountered; filesystem operation aborted."
+            print ("Error encountered; filesystem operation aborted.")
 
         return p.returncode

src/robot_upstart/providers.py

@@ -30,14 +30,14 @@
 
 import em
 import os
-import StringIO
+import io
 
 from catkin.find_in_workspaces import find_in_workspaces
 
 
 def detect_provider():
     cmd = open('/proc/1/cmdline', 'rb').read().split('\x00')[0]
-    print os.path.realpath(cmd)
+    print (os.path.realpath(cmd))
     if 'systemd' in os.path.realpath(cmd):
         return Systemd
     return Upstart
@@ -116,7 +116,7 @@ def generate_install(self):
         # all of it. A more sophisticated future implementation could track contents or hashes and
         # thereby warn users when a new installation is stomping a change they have made.
         self._load_installed_files_set()
-        self.installed_files_set.update(self.installation_files.keys())
+        self.installed_files_set.update(list(self.installation_files.keys()))
 
         # Remove the job directory. This will fail if it is not empty, and notify the user.
         self.installed_files_set.add(self.job.job_path)
@@ -146,7 +146,7 @@ def _set_job_path(self):
             self.root, "etc/ros", self.job.rosdistro, self.job.name + ".d")
 
     def _fill_template(self, template):
-        self.interpreter.output = StringIO.StringIO()
+        self.interpreter.output = io.StringIO()
         self.interpreter.reset()
         with open(find_in_workspaces(project="robot_upstart", path=template)[0]) as f:
             self.interpreter.file(f)
@@ -191,7 +191,7 @@ def generate_install(self):
         # all of it. A more sophisticated future implementation could track contents or hashes and
         # thereby warn users when a new installation is stomping a change they have made.
         self._load_installed_files_set()
-        self.installed_files_set.update(self.installation_files.keys())
+        self.installed_files_set.update(list(self.installation_files.keys()))
 
         # Remove the job directory. This will fail if it is not empty, and notify the user.
         self.installed_files_set.add(self.job.job_path)
@@ -223,7 +223,7 @@ def _set_job_path(self):
             self.root, "etc/ros", self.job.rosdistro, self.job.name + ".d")
 
     def _fill_template(self, template):
-        self.interpreter.output = StringIO.StringIO()
+        self.interpreter.output = io.StringIO()
         self.interpreter.reset()
         with open(find_in_workspaces(project="robot_upstart", path=template)[0]) as f:
             self.interpreter.file(f)