diff options
| author | Kali Kaneko (leap communications) <kali@leap.se> | 2016-09-20 19:54:10 -0400 |
|---|---|---|
| committer | Kali Kaneko (leap communications) <kali@leap.se> | 2016-09-20 19:57:52 -0400 |
| commit | 1293f27595f19190b9bbe10cf94709cc1ba660c7 (patch) | |
| tree | d41a692cd682c46665c5b3624865676ac8facc2a /src/leap | |
| parent | fb3b431897a494198b00ef8aa9bed7bc73508985 (diff) | |
[style] pep8 cleanup
Diffstat (limited to 'src/leap')
| -rw-r--r-- | src/leap/bitmask/cli/webui.py | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/core/_web.py | 4 | ||||
| -rw-r--r-- | src/leap/bitmask/core/dispatcher.py | 3 |
3 files changed, 2 insertions, 7 deletions
diff --git a/src/leap/bitmask/cli/webui.py b/src/leap/bitmask/cli/webui.py index d4d5f78..c45f615 100644 --- a/src/leap/bitmask/cli/webui.py +++ b/src/leap/bitmask/cli/webui.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# webui.py +# webui.py # Copyright (C) 2016 LEAP Encryption Access Project # # This program is free software: you can redistribute it and/or modify diff --git a/src/leap/bitmask/core/_web.py b/src/leap/bitmask/core/_web.py index c597d18..ae22325 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 f3393a5..dba75b6 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] |