Merge tag '1.6' into debian

* tag '1.6':
  Python3 support

1 files changed, 4 insertions, 4 deletions

diff --git a/spline-startup b/spline-startup
index fc1404f..d0437af 100755
--- a/spline-startup
+++ b/spline-startup
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 import argparse
@@ -62,7 +62,7 @@ class Executor(Popen):
                 pass
 
             if ready[0] != []:
-                buffer += self.stdout.read(8192)
+                buffer += self.stdout.read(8192).decode('utf-8')
                 lines = buffer.splitlines()
                 for line in lines[:-1]:
                     yield line
@@ -72,7 +72,7 @@ class Executor(Popen):
         self.wait()
 
         try:
-            buffer += self.stdout.read(8192)
+            buffer += self.stdout.read(8192).decode('utf-8')
         except:
             pass
 
@@ -168,7 +168,7 @@ class SplineStartup(object):
         self._pinfo('Getting scripts: %s' % ' '.join(cmd))
         proc = Popen(cmd, stdout=PIPE, stderr=STDOUT)
         output, _ = proc.communicate()
-        return output.strip().splitlines()
+        return output.strip().decode('utf-8').splitlines()
 
     def _run_scripts(self, user, actions, use_su=True):
         self._pdebug("Running scripts for user '%s'" % user.pw_name)