summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2022-06-07 16:43:27 +0200
committerAlexander Sulfrian <alexander@sulfrian.net>2022-06-07 16:44:19 +0200
commitba97815a7a44e6815c9d4baefe77604569fecbcb (patch)
treeb5d89cc4568737030fcfd835b80e98ffe5988a11
parent5c897e15cef7edce935c3bd222dd3d5c0a6956f1 (diff)
downloadspline-startup-ba97815a7a44e6815c9d4baefe77604569fecbcb.tar.gz
spline-startup-ba97815a7a44e6815c9d4baefe77604569fecbcb.tar.bz2
spline-startup-ba97815a7a44e6815c9d4baefe77604569fecbcb.zip
Python3 support1.6
-rwxr-xr-xspline-startup8
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)