External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-10 14:09:28 -02:30
Code Issues Packages Projects Releases Wiki Activity

remove py2 compatability from awx.main.expect.run

Browse Source 
this module is no longer run on isolated nodes (they use runner now)
This commit is contained in:
Ryan Petrello
2019-03-22 08:47:18 -04:00
parent 42bfff301c
commit e6abd77c96
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/main/expect/run.py
View File

@@ -14,10 +14,7 @@ import signal
import sys import sys
import threading import threading
import time import time
try: from io import StringIO
from io import StringIO
except ImportError:
from StringIO import StringIO
import pexpect import pexpect
import psutil import psutil
@@ -231,10 +228,7 @@ def handle_termination(pid, args, proot_cmd, is_cancel=True):
instance's cancel_flag. instance's cancel_flag.
''' '''
try: try:
if sys.version_info > (3, 0): used_proot = proot_cmd.encode('utf-8') in args
used_proot = proot_cmd.encode('utf-8') in args
else:
used_proot = proot_cmd in ' '.join(args)
if used_proot: if used_proot:
if not psutil: if not psutil:
os.kill(pid, signal.SIGKILL) os.kill(pid, signal.SIGKILL)