diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-03-13 17:37:30 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-03-13 18:27:55 -0300 |
| commit | db31692ddf48abed1d02afc56eb33c8d7cd15234 (patch) | |
| tree | 8ad566a30efa22707a03caf2e75406d1af35a8fd /src | |
| parent | fa6ac24e679b0263efd2eb89ba53eeccd9ebb4d1 (diff) | |
Support latest psutil version.
Diffstat (limited to 'src')
| -rw-r--r-- | src/leap/bitmask/services/eip/vpnprocess.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/leap/bitmask/services/eip/vpnprocess.py b/src/leap/bitmask/services/eip/vpnprocess.py index 51f0f738..5c100036 100644 --- a/src/leap/bitmask/services/eip/vpnprocess.py +++ b/src/leap/bitmask/services/eip/vpnprocess.py @@ -19,14 +19,20 @@ VPN Manager, spawned in a custom processProtocol. """ import logging import os -import psutil -import psutil.error import shutil import socket import sys from itertools import chain, repeat +import psutil +try: + # psutil < 2.0.0 + from psutil.error import AccessDenied as psutil_AccessDenied +except ImportError: + # psutil >= 2.0.0 + from psutil import AccessDenied as psutil_AccessDenied + from PySide import QtCore from leap.bitmask.config.providerconfig import ProviderConfig @@ -672,7 +678,7 @@ class VPNManager(object): if any(map(lambda s: s.find("LEAPOPENVPN") != -1, p.cmdline)): openvpn_process = p break - except psutil.error.AccessDenied: + except psutil_AccessDenied: pass return openvpn_process |