diff options
| author | Micah Anderson <micah@riseup.net> | 2013-08-22 14:10:50 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-08-22 14:10:50 -0400 |
| commit | 6bae67c3e7c66af9e8ce1605070f7e92f247f0cb (patch) | |
| tree | 64dc7e2588cc5c17fdb6c801877792f83cfcecf3 /src/leap/util/misc.py | |
| parent | 00efccabb1eb6c3597282bc0e095cf2026f75a3b (diff) | |
| parent | 00d98a47c60764475d97df1c2eb847e20a77cae5 (diff) | |
Merge tag '0.3.0' into debian
Tag bitmask version 0.3.0
Conflicts:
.coveragerc
.tx/config
NEWS.rst
setup.cfg
src/leap/base/checks.py
src/leap/base/exceptions.py
src/leap/base/tests/test_checks.py
src/leap/eip/checks.py
src/leap/gui/firstrun/login.py
src/leap/gui/locale_rc.py
src/leap/util/polkit.py
tests/test_qt_environment.py
tox.ini
Diffstat (limited to 'src/leap/util/misc.py')
| -rw-r--r-- | src/leap/util/misc.py | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/src/leap/util/misc.py b/src/leap/util/misc.py deleted file mode 100644 index d869a1ba..00000000 --- a/src/leap/util/misc.py +++ /dev/null @@ -1,37 +0,0 @@ -""" -misc utils -""" -import psutil - -from leap.base.constants import OPENVPN_BIN - - -class ImproperlyConfigured(Exception): - """ - """ - - -def null_check(value, value_name): - try: - assert value is not None - except AssertionError: - raise ImproperlyConfigured( - "%s parameter cannot be None" % value_name) - - -def get_openvpn_pids(): - # binary name might change - - openvpn_pids = [] - for p in psutil.process_iter(): - try: - # XXX Not exact! - # Will give false positives. - # we should check that cmdline BEGINS - # with openvpn or with our wrapper - # (pkexec / osascript / whatever) - if OPENVPN_BIN in ' '.join(p.cmdline): - openvpn_pids.append(p.pid) - except psutil.error.AccessDenied: - pass - return openvpn_pids |