summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/vpn/process.py
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2017-02-01 16:12:39 +0100
committerKali Kaneko (leap communications) <kali@leap.se>2017-02-23 00:40:32 +0100
commitef57df5a4791f81871f2da42c1bb3086d0ed0815 (patch)
tree0b452947d4d9ad0076000af5e5e0f7957fabf71d /src/leap/bitmask/vpn/process.py
parent1d4a3d68869dd9c416b104399097a6bb0c1bace3 (diff)
[refactor] sort out some imports
Diffstat (limited to 'src/leap/bitmask/vpn/process.py')
-rw-r--r--src/leap/bitmask/vpn/process.py12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/leap/bitmask/vpn/process.py b/src/leap/bitmask/vpn/process.py
index 47c2942..ef5ee37 100644
--- a/src/leap/bitmask/vpn/process.py
+++ b/src/leap/bitmask/vpn/process.py
@@ -29,16 +29,6 @@ import sys
from itertools import chain, repeat
-import psutil
-try:
- # psutil < 2.0.0
- from psutil.error import AccessDenied as psutil_AccessDenied
- PSUTIL_2 = False
-except ImportError:
- # psutil >= 2.0.0
- from psutil import AccessDenied as psutil_AccessDenied
- PSUTIL_2 = True
-
from twisted.internet import defer, protocol, reactor
from twisted.internet import error as internet_error
from twisted.internet.task import LoopingCall
@@ -90,7 +80,7 @@ class VPNProcess(protocol.ProcessProtocol, _management.VPNManagement):
openvpn invocation
:type openvpn_verb: int
"""
- VPNManagement.__init__(self, signaler=signaler)
+ _management.VPNManagement.__init__(self, signaler=signaler)
self._eipconfig = eipconfig
self._providerconfig = providerconfig