From ef57df5a4791f81871f2da42c1bb3086d0ed0815 Mon Sep 17 00:00:00 2001 From: "Kali Kaneko (leap communications)" Date: Wed, 1 Feb 2017 16:12:39 +0100 Subject: [refactor] sort out some imports --- src/leap/bitmask/vpn/process.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'src/leap/bitmask/vpn/process.py') diff --git a/src/leap/bitmask/vpn/process.py b/src/leap/bitmask/vpn/process.py index 47c29423..ef5ee37f 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 -- cgit v1.2.3