diff options
Diffstat (limited to 'src/leap/bitmask/core')
| -rw-r--r-- | src/leap/bitmask/core/_web.py | 4 | ||||
| -rw-r--r-- | src/leap/bitmask/core/dispatcher.py | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/leap/bitmask/core/_web.py b/src/leap/bitmask/core/_web.py index c597d18e..ae223258 100644 --- a/src/leap/bitmask/core/_web.py +++ b/src/leap/bitmask/core/_web.py @@ -40,7 +40,6 @@ except ImportError: HAS_WEB_UI = False - class HTTPDispatcherService(service.Service): """ @@ -59,7 +58,7 @@ class HTTPDispatcherService(service.Service): else: log.msg('leap.bitmask_www not found, serving bitmask.core web ui') webdir = os.path.abspath( - pkg_resources.resource_filename('leap.bitmask.core', 'web')) + pkg_resources.resource_filename('leap.bitmask.core', 'web')) root = File(webdir) api = Api(CommandDispatcher(self._core)) @@ -83,7 +82,6 @@ class HTTPDispatcherService(service.Service): return {'web': status} - class Api(Resource): isLeaf = True diff --git a/src/leap/bitmask/core/dispatcher.py b/src/leap/bitmask/core/dispatcher.py index f3393a59..dba75b6a 100644 --- a/src/leap/bitmask/core/dispatcher.py +++ b/src/leap/bitmask/core/dispatcher.py @@ -407,7 +407,6 @@ class CommandDispatcher(object): d.addCallbacks(_format_result, _format_error) return d - def do_WEBUI(self, *parts): subcmd = parts[1] dispatch = self.subcommand_webui.dispatch @@ -429,7 +428,6 @@ class CommandDispatcher(object): d.addCallbacks(_format_result, _format_error) return d - def do_KEYS(self, *parts): dispatch = self.subcommand_keys.dispatch @@ -451,7 +449,6 @@ class CommandDispatcher(object): d.addCallbacks(_format_result, _format_error) return d - def dispatch(self, msg): cmd = msg[0] |