diff options
| author | David Baker <dave@matrix.org> | 2015-03-23 14:23:51 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-03-23 14:23:51 +0000 |
| commit | 78adccfaf497dcb75451adfc5d366d5ff26cad52 (patch) | |
| tree | 3eab60460695955647142c34bf65dbc906896b54 /synapse | |
| parent | Implement password changing (finally) along with a start on making client/ser... (diff) | |
| download | synapse-78adccfaf497dcb75451adfc5d366d5ff26cad52.tar.xz | |
pep8 / pyflakes
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/handlers/login.py | 6 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/password.py | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/synapse/handlers/login.py b/synapse/handlers/login.py index 19b560d91e..7aff2e69e6 100644 --- a/synapse/handlers/login.py +++ b/synapse/handlers/login.py @@ -16,13 +16,9 @@ from twisted.internet import defer from ._base import BaseHandler -from synapse.api.errors import LoginError, Codes, CodeMessageException -from synapse.http.client import SimpleHttpClient -from synapse.util.emailutils import EmailException -import synapse.util.emailutils as emailutils +from synapse.api.errors import LoginError, Codes import bcrypt -import json import logging logger = logging.getLogger(__name__) diff --git a/synapse/rest/client/v2_alpha/password.py b/synapse/rest/client/v2_alpha/password.py index 3663781c95..1277532110 100644 --- a/synapse/rest/client/v2_alpha/password.py +++ b/synapse/rest/client/v2_alpha/password.py @@ -21,7 +21,6 @@ from synapse.http.servlet import RestServlet from ._base import client_v2_pattern, parse_json_dict_from_request -import simplejson as json import logging @@ -72,5 +71,6 @@ class PasswordRestServlet(RestServlet): defer.returnValue((200, {})) + def register_servlets(hs, http_server): - PasswordRestServlet(hs).register(http_server) \ No newline at end of file + PasswordRestServlet(hs).register(http_server) |