From faec0158d9ce9b2955867116b02984a5da301c81 Mon Sep 17 00:00:00 2001 From: David Wilson Date: Fri, 9 Aug 2019 21:21:00 +0100 Subject: [PATCH] ci: Py3 fix --- .ci/ci_lib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/ci_lib.py b/.ci/ci_lib.py index 9225723e..251c826b 100644 --- a/.ci/ci_lib.py +++ b/.ci/ci_lib.py @@ -220,7 +220,7 @@ INTERESTING_COMMS = ('python', 'ssh', 'sudo', 'su', 'doas') def proc_is_docker(pid): try: - fp = open('/proc/%s/cgroup' % (pid,), 'rb') + fp = open('/proc/%s/cgroup' % (pid,), 'r') except IOError: return False @@ -236,7 +236,7 @@ def get_interesting_procs(container_name=None): args = ['docker', 'exec', container_name] + args out = [] - for line in subprocess__check_output(args).splitlines(): + for line in subprocess__check_output(args).decode().splitlines(): ppid, pid, comm, rest = line.split(None, 3) if ( (