summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-03-08 11:36:21 -0400
committerKali Kaneko <kali@leap.se>2016-04-19 09:59:41 -0400
commit23d5143d7b66e30f84556be85eeced5f914598a9 (patch)
tree26c653c5fb5359a39f0071c87db884182263f3fe /src
parent59009db169e9e75ec6271601d38cd0fba2bd8806 (diff)
[refactor] use __version__ directly
Diffstat (limited to 'src')
-rw-r--r--src/leap/bitmask/core/service.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/leap/bitmask/core/service.py b/src/leap/bitmask/core/service.py
index 4c18ab5d..87349ef6 100644
--- a/src/leap/bitmask/core/service.py
+++ b/src/leap/bitmask/core/service.py
@@ -22,16 +22,14 @@ import resource
from twisted.internet import reactor
from twisted.python import log
-from leap.bonafide.service import BonafideService
-
+from leap.bitmask import __version__
from leap.bitmask.core import configurable
from leap.bitmask.core import mail_services
from leap.bitmask.core import _zmq
from leap.bitmask.core import websocket
-from leap.bitmask.core._version import get_versions
-
+from leap.bonafide.service import BonafideService
from leap.common.events import server as event_server
-from leap.vpn import EIPService
+#from leap.vpn import EIPService
class BitmaskBackend(configurable.ConfigurableService):
@@ -96,7 +94,9 @@ class BitmaskBackend(configurable.ConfigurableService):
self._maybe_start_service('mail', service, self.basedir)
def init_eip(self):
- self._maybe_start_service('eip', EIPService)
+ # FIXME -- land EIP into leap.vpn
+ pass
+ #self._maybe_start_service('eip', EIPService)
def init_zmq(self):
zs = _zmq.ZMQServerService(self)
@@ -139,7 +139,7 @@ class BitmaskBackend(configurable.ConfigurableService):
return " ".join(status_messages)
def do_version(self):
- version = get_versions()['version']
+ version = __version__
return 'BitmaskCore: %s' % version
def do_shutdown(self):