diff options
| author | Kali Kaneko (leap communications) <kali@leap.se> | 2017-02-07 10:18:38 +0100 | 
|---|---|---|
| committer | Kali Kaneko (leap communications) <kali@leap.se> | 2017-02-23 00:40:41 +0100 | 
| commit | 9d7de357a114812c0ed1e04b97ef59b41a40fa47 (patch) | |
| tree | 22118a7b418872cceee01fb4df923a86fdc1557b | |
| parent | dd7c63bd9ca5570d9a924d131c4786ffd15e2d2d (diff) | |
[style] pep8
| -rw-r--r-- | src/leap/bitmask/vpn/_config.py | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/vpn/_control.py | 3 | ||||
| -rw-r--r-- | src/leap/bitmask/vpn/_status.py | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/vpn/launcher.py | 4 | ||||
| -rw-r--r-- | src/leap/bitmask/vpn/launchers/linux.py | 4 | ||||
| -rw-r--r-- | src/leap/bitmask/vpn/manager.py | 5 | 
6 files changed, 3 insertions, 15 deletions
| diff --git a/src/leap/bitmask/vpn/_config.py b/src/leap/bitmask/vpn/_config.py index 267f61eb..8ae266a1 100644 --- a/src/leap/bitmask/vpn/_config.py +++ b/src/leap/bitmask/vpn/_config.py @@ -45,4 +45,3 @@ class _TempProviderConfig(object):      def get_ca_cert_path(self):          return self._path - diff --git a/src/leap/bitmask/vpn/_control.py b/src/leap/bitmask/vpn/_control.py index 49d7acef..bff5c098 100644 --- a/src/leap/bitmask/vpn/_control.py +++ b/src/leap/bitmask/vpn/_control.py @@ -127,7 +127,6 @@ class VPNControl(object):          return True -      # FIXME -- is this used from somewhere???      def bitmask_root_vpn_down(self):          """ @@ -191,7 +190,6 @@ class VPNControl(object):          except OSError:              logger.error("Could not kill process!") -      def _start_pollers(self):          """          Iterate through the registered observers @@ -200,7 +198,6 @@ class VPNControl(object):          for poller in self._pollers:              poller.start(POLL_TIME) -      def _stop_pollers(self):          """          Iterate through the registered observers diff --git a/src/leap/bitmask/vpn/_status.py b/src/leap/bitmask/vpn/_status.py index 940c0cd6..a0e38420 100644 --- a/src/leap/bitmask/vpn/_status.py +++ b/src/leap/bitmask/vpn/_status.py @@ -5,7 +5,6 @@ from ._human import bytes2human  logger = Logger() -  # TODO implement a state machine in this class diff --git a/src/leap/bitmask/vpn/launcher.py b/src/leap/bitmask/vpn/launcher.py index 5a904890..84f5f662 100644 --- a/src/leap/bitmask/vpn/launcher.py +++ b/src/leap/bitmask/vpn/launcher.py @@ -267,8 +267,8 @@ class VPNLauncher(object):              '--ping-restart', '10']          args += [ -                '--persist-key', -                '--persist-local-ip', '--persist-remote-ip'] +            '--persist-key', +            '--persist-local-ip', '--persist-remote-ip']          command_and_args = [openvpn_path] + args          return command_and_args diff --git a/src/leap/bitmask/vpn/launchers/linux.py b/src/leap/bitmask/vpn/launchers/linux.py index f99c5c78..b54790f2 100644 --- a/src/leap/bitmask/vpn/launchers/linux.py +++ b/src/leap/bitmask/vpn/launchers/linux.py @@ -46,10 +46,6 @@ class EIPNoPkexecAvailable(VPNLauncherException):      pass -SYSTEM_CONFIG = "/etc/leap" -leapfile = lambda f: "%s/%s" % (SYSTEM_CONFIG, f) - -  class LinuxVPNLauncher(VPNLauncher):      # The following classes depend on force_eval to be called against diff --git a/src/leap/bitmask/vpn/manager.py b/src/leap/bitmask/vpn/manager.py index abadc00e..bf511b38 100644 --- a/src/leap/bitmask/vpn/manager.py +++ b/src/leap/bitmask/vpn/manager.py @@ -27,9 +27,8 @@ from ._config import _TempEIPConfig, _TempProviderConfig  from .constants import IS_WIN -  # TODO this is very badly named. There is another class that is called -# manager. This  +# manager. This  class VPNManager(object): @@ -81,7 +80,6 @@ class VPNManager(object):          result = self._vpn.stop(False, False)  # TODO review params          return result -      @property      def status(self):          return self._vpn.status @@ -90,7 +88,6 @@ class VPNManager(object):      def traffic_status(self):          return self._vpn.traffic_status -      def _get_management_location(self):          """          Return a tuple with the host (socket) and port to be used for VPN. | 
