Rooba
/
mitogen
mirror of https://github.com/mitogen-hq/mitogen.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ci: Py3 fix

This commit is contained in:
David Wilson 2019-08-09 21:21:00 +01:00
parent cf23d0dee6
commit faec0158d9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/ci_lib.py
View File

@ -220,7 +220,7 @@ INTERESTING_COMMS = ('python', 'ssh', 'sudo', 'su', 'doas')
def proc_is_docker(pid): def proc_is_docker(pid):
try: try:
fp = open('/proc/%s/cgroup' % (pid,), 'rb') fp = open('/proc/%s/cgroup' % (pid,), 'r')
except IOError: except IOError:
return False return False
@ -236,7 +236,7 @@ def get_interesting_procs(container_name=None):
args = ['docker', 'exec', container_name] + args args = ['docker', 'exec', container_name] + args
out = [] 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) ppid, pid, comm, rest = line.split(None, 3)
if ( if (
( (