diff options
| -rw-r--r-- | llvm/utils/lit/lit/util.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/llvm/utils/lit/lit/util.py b/llvm/utils/lit/lit/util.py index a6e8d52c075..40a57716869 100644 --- a/llvm/utils/lit/lit/util.py +++ b/llvm/utils/lit/lit/util.py @@ -267,7 +267,14 @@ def killProcessAndChildren(pid): import psutil try: psutilProc = psutil.Process(pid) - for child in psutilProc.children(recursive=True): + # Handle the different psutil API versions + try: + # psutil >= 2.x + children_iterator = psutilProc.children(recursive=True) + except AttributeError: + # psutil 1.x + children_iterator = psutilProc.get_children(recursive=True) + for child in children_iterator: try: child.kill() except psutil.NoSuchProcess: |
