diff options
author | Calum Lind <calumlind+deluge@gmail.com> | 2014-09-19 19:10:09 +0100 |
---|---|---|
committer | Calum Lind <calumlind+deluge@gmail.com> | 2014-09-19 19:10:14 +0100 |
commit | 30a0f3c9ed9310635914225aec6995c5b687614e (patch) | |
tree | 7c6d10ca5458a08194260a300d08590d801fe1b4 /deluge/ui/web | |
parent | d0b8e17873328adbd7ac767a875a2a80fa7c5591 (diff) | |
download | deluge-30a0f3c9ed9310635914225aec6995c5b687614e.tar.gz deluge-30a0f3c9ed9310635914225aec6995c5b687614e.tar.bz2 deluge-30a0f3c9ed9310635914225aec6995c5b687614e.zip |
Flake8 pass of entire codebase
* Use the inline '# NOQA' to supress N802 lower-case warnings
Diffstat (limited to 'deluge/ui/web')
-rw-r--r-- | deluge/ui/web/auth.py | 8 | ||||
-rw-r--r-- | deluge/ui/web/json_api.py | 6 | ||||
-rw-r--r-- | deluge/ui/web/server.py | 22 |
3 files changed, 18 insertions, 18 deletions
diff --git a/deluge/ui/web/auth.py b/deluge/ui/web/auth.py index 94ba6decd..ed8c715e7 100644 --- a/deluge/ui/web/auth.py +++ b/deluge/ui/web/auth.py @@ -276,7 +276,7 @@ class Auth(JSONComponent): :returns: True if the session is valid, False if not. :rtype: booleon """ - return __request__.session_id is not None + return __request__.session_id is not None # NOQA @export def delete_session(self): @@ -287,7 +287,7 @@ class Auth(JSONComponent): :type session_id: string """ config = component.get("DelugeWeb").config - del config["sessions"][__request__.session_id] + del config["sessions"][__request__.session_id] # NOQA return True @export(AUTH_LEVEL_NONE) @@ -301,7 +301,7 @@ class Auth(JSONComponent): :rtype: string or False """ if self.check_password(password): - return self._create_session(__request__) + return self._create_session(__request__) # NOQA else: - log.error('Login failed (ClientIP %s)', __request__.getClientIP()) + log.error('Login failed (ClientIP %s)', __request__.getClientIP()) # NOQA return False diff --git a/deluge/ui/web/json_api.py b/deluge/ui/web/json_api.py index 10480325c..1e18eb636 100644 --- a/deluge/ui/web/json_api.py +++ b/deluge/ui/web/json_api.py @@ -975,7 +975,7 @@ class WebApi(JSONComponent): :param event: The event name :type event: string """ - self.event_queue.add_listener(__request__.session_id, event) + self.event_queue.add_listener(__request__.session_id, event) # NOQA @export def deregister_event_listener(self, event): @@ -985,11 +985,11 @@ class WebApi(JSONComponent): :param event: The event name :type event: string """ - self.event_queue.remove_listener(__request__.session_id, event) + self.event_queue.remove_listener(__request__.session_id, event) # NOQA @export def get_events(self): """ Retrieve the pending events for the session. """ - return self.event_queue.get_events(__request__.session_id) + return self.event_queue.get_events(__request__.session_id) # NOQA diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py index aa5fc2d08..0b913eb59 100644 --- a/deluge/ui/web/server.py +++ b/deluge/ui/web/server.py @@ -127,7 +127,7 @@ class Upload(resource.Resource): class Render(resource.Resource): - def getChild(self, path, request): + def getChild(self, path, request): # NOQA request.render_file = path return self @@ -152,7 +152,7 @@ class Tracker(resource.Resource): except KeyError: self.tracker_icons = TrackerIcons() - def getChild(self, path, request): + def getChild(self, path, request): # NOQA request.tracker_name = path return self @@ -175,7 +175,7 @@ class Tracker(resource.Resource): class Flag(resource.Resource): - def getChild(self, path, request): + def getChild(self, path, request): # NOQA request.country = path return self @@ -202,18 +202,18 @@ class LookupResource(resource.Resource, component.Component): self.__paths = {} for directory in directories: - self.addDirectory(directory) + self.add_directory(directory) - def addDirectory(self, directory, path=""): + def add_directory(self, directory, path=""): log.debug("Adding directory `%s` with path `%s`", directory, path) paths = self.__paths.setdefault(path, []) paths.append(directory) - def removeDirectory(self, directory, path=""): + def remove_directory(self, directory, path=""): log.debug("Removing directory `%s`", directory) self.__paths[path].remove(directory) - def getChild(self, path, request): + def getChild(self, path, request): # NOQA if hasattr(request, 'lookup_path'): request.lookup_path = os.path.join(request.lookup_path, path) else: @@ -365,7 +365,7 @@ class ScriptResource(resource.Resource, component.Component): scripts.append("js/" + path) return scripts - def getChild(self, path, request): + def getChild(self, path, request): # NOQA if hasattr(request, "lookup_path"): request.lookup_path += '/' + path else: @@ -475,13 +475,13 @@ class TopLevel(resource.Resource): self.__scripts.remove(script) self.__debug_scripts.remove(script) - def getChild(self, path, request): + def getChild(self, path, request): # NOQA if path == "": return self else: return resource.Resource.getChild(self, path, request) - def getChildWithDefault(self, path, request): + def getChildWithDefault(self, path, request): # NOQA # Calculate the request base header = request.getHeader('x-deluge-base') base = header if header else component.get("DelugeWeb").base @@ -540,7 +540,7 @@ class TopLevel(resource.Resource): class ServerContextFactory: - def getContext(self): + def getContext(self): # NOQA """Creates an SSL context.""" ctx = SSL.Context(SSL.SSLv3_METHOD) deluge_web = component.get("DelugeWeb") |