diff options
| -rw-r--r-- | src/leap/bitmask/cli/command.py | 4 | ||||
| -rw-r--r-- | src/leap/bitmask/cli/logs.py | 4 | ||||
| -rw-r--r-- | src/leap/bitmask/vpn/constants.py | 3 | ||||
| -rw-r--r-- | src/leap/bitmask/vpn/fw/firewall.py | 6 | ||||
| -rw-r--r-- | src/leap/bitmask/vpn/helpers/__init__.py | 7 |
5 files changed, 15 insertions, 9 deletions
diff --git a/src/leap/bitmask/cli/command.py b/src/leap/bitmask/cli/command.py index a70b2d43..d31c3a00 100644 --- a/src/leap/bitmask/cli/command.py +++ b/src/leap/bitmask/cli/command.py @@ -181,5 +181,5 @@ class Command(object): if callable(errb): errb() else: - print (Fore.RED + "[ERROR] Timeout contacting the bitmask " - "daemon. Is it running?" + Fore.RESET) + print(Fore.RED + "[ERROR] Timeout contacting the bitmask " + "daemon. Is it running?" + Fore.RESET) diff --git a/src/leap/bitmask/cli/logs.py b/src/leap/bitmask/cli/logs.py index ae7acaec..311235cb 100644 --- a/src/leap/bitmask/cli/logs.py +++ b/src/leap/bitmask/cli/logs.py @@ -65,8 +65,8 @@ SUBCOMMANDS: yield line _file = open(_log_path, 'r') - print (Fore.GREEN + '[bitmask] ' + - Fore.RESET + 'Watching log file %s' % _log_path) + print(Fore.GREEN + '[bitmask] ' + + Fore.RESET + 'Watching log file %s' % _log_path) for line in _file.readlines(): print line, for line in tail(_file): diff --git a/src/leap/bitmask/vpn/constants.py b/src/leap/bitmask/vpn/constants.py index a380bc3c..ddb5b51a 100644 --- a/src/leap/bitmask/vpn/constants.py +++ b/src/leap/bitmask/vpn/constants.py @@ -34,4 +34,5 @@ if IS_LINUX: OPENVPN_SNAP = '/snap/bin/riseup-vpn.openvpn' POLKIT_LOCAL = '/usr/share/polkit-1/actions/se.leap.bitmask.bundle.policy' POLKIT_SYSTEM = '/usr/share/polkit-1/actions/se.leap.bitmask.policy' - POLKIT_SNAP = '/usr/share/polkit-1/actions/se.leap.bitmask.riseupvpn.policy' + POLKIT_SNAP = ('/usr/share/polkit-1/actions/' + 'se.leap.bitmask.riseupvpn.policy') diff --git a/src/leap/bitmask/vpn/fw/firewall.py b/src/leap/bitmask/vpn/fw/firewall.py index cc5d76d0..2a0300cf 100644 --- a/src/leap/bitmask/vpn/fw/firewall.py +++ b/src/leap/bitmask/vpn/fw/firewall.py @@ -102,10 +102,12 @@ class _LinuxFirewallManager(object): else: if os.path.isfile(BITMASK_ROOT_SYSTEM): # we can be running from the debian package, - # or some other distro. it's the maintainer responsibility to put bitmask-root there. + # or some other distro. it's the maintainer responsibility to put + # bitmask-root there. BITMASK_ROOT = BITMASK_ROOT_SYSTEM else: - # as a last case, we fall back to installing into the /usr/local/sbin version. + # as a last case, we fall back to installing into the + # /usr/local/sbin version. BITMASK_ROOT = BITMASK_ROOT_LOCAL def __init__(self, remotes): diff --git a/src/leap/bitmask/vpn/helpers/__init__.py b/src/leap/bitmask/vpn/helpers/__init__.py index 96ec4f2e..5d2c9971 100644 --- a/src/leap/bitmask/vpn/helpers/__init__.py +++ b/src/leap/bitmask/vpn/helpers/__init__.py @@ -19,9 +19,12 @@ if IS_LINUX: from leap.bitmask.vpn.constants import BITMASK_ROOT_SYSTEM from leap.bitmask.vpn.constants import BITMASK_ROOT_LOCAL from leap.bitmask.vpn.constants import BITMASK_ROOT_SNAP - from leap.bitmask.vpn.constants import OPENVPN_SYSTEM, OPENVPN_LOCAL + from leap.bitmask.vpn.constants import OPENVPN_SYSTEM + from leap.bitmask.vpn.constants import OPENVPN_LOCAL from leap.bitmask.vpn.constants import OPENVPN_SNAP - from leap.bitmask.vpn.constants import POLKIT_SYSTEM, POLKIT_LOCAL, POLKIT_SNAP + from leap.bitmask.vpn.constants import POLKIT_SYSTEM + from leap.bitmask.vpn.constants import POLKIT_LOCAL + from leap.bitmask.vpn.constants import POLKIT_SNAP from leap.bitmask.vpn.privilege import is_pkexec_in_system from leap.bitmask.vpn.privilege import LinuxPolicyChecker |