diff options
Diffstat (limited to 'deluge/ui/web/server.py')
| -rw-r--r-- | deluge/ui/web/server.py | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py index 192c2b7..f391a78 100644 --- a/deluge/ui/web/server.py +++ b/deluge/ui/web/server.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # # Copyright (C) 2009-2010 Damien Churchill <damoxc@gmail.com> # @@ -7,8 +6,6 @@ # See LICENSE for more details. # -from __future__ import unicode_literals - import fnmatch import json import logging @@ -23,8 +20,7 @@ from twisted.web.resource import EncodingResourceWrapper from deluge import common, component, configmanager from deluge.common import is_ipv6 -from deluge.core.rpcserver import check_ssl_keys -from deluge.crypto_utils import get_context_factory +from deluge.crypto_utils import check_ssl_keys, get_context_factory from deluge.i18n import set_language, setup_translation from deluge.ui.tracker_icons import TrackerIcons from deluge.ui.web.auth import Auth @@ -191,7 +187,7 @@ class Tracker(resource.Resource): request.finish() def render(self, request): - d = self.tracker_icons.fetch(request.tracker_name) + d = self.tracker_icons.fetch(request.tracker_name.decode()) d.addCallback(self.on_got_icon, request) return server.NOT_DONE_YET @@ -376,7 +372,7 @@ class ScriptResource(resource.Resource, component.Component): order_file = os.path.join(root, '.order') if os.path.isfile(order_file): - with open(order_file, 'r') as _file: + with open(order_file) as _file: for line in _file: if line.startswith('+ '): order_filename = line.split()[1] @@ -592,13 +588,13 @@ class TopLevel(resource.Resource): uri_false = ('false', 'no', 'off', '0') debug_arg = None - req_dbg_arg = request.args.get('debug', [b''])[-1].decode().lower() + req_dbg_arg = request.args.get(b'debug', [b''])[-1].decode().lower() if req_dbg_arg in uri_true: debug_arg = True elif req_dbg_arg in uri_false: debug_arg = False - dev_arg = request.args.get('dev', [b''])[-1].decode().lower() in uri_true + dev_arg = request.args.get(b'dev', [b''])[-1].decode().lower() in uri_true dev_ver = 'dev' in common.get_version() script_type = 'normal' @@ -653,7 +649,7 @@ class DelugeWeb(component.Component): Args: options (argparse.Namespace): The web server options. - daemon (bool): If True run web server as a seperate daemon process (starts a twisted + daemon (bool): If True run web server as a separate daemon process (starts a twisted reactor). If False shares the process and twisted reactor from WebUI plugin or tests. """ @@ -698,7 +694,7 @@ class DelugeWeb(component.Component): self.auth = Auth(self.config) self.daemon = daemon - # Initalize the plugins + # Initialize the plugins self.plugins = PluginManager() def _on_language_changed(self, key, value): |