diff options
| author | David Baker <dave@matrix.org> | 2015-03-31 09:50:44 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-03-31 09:50:44 +0100 |
| commit | 9f642a93ecab62fb56776ad4b7d7b062b869b66a (patch) | |
| tree | 90e44b9b4c62b208282749a77a3bc25281952b0a /synapse/rest | |
| parent | Update CAPTCHA_SETUP (it continues to ignore fallback, but I guess I should f... (diff) | |
| download | synapse-9f642a93ecab62fb56776ad4b7d7b062b869b66a.tar.xz | |
pep8
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/client/v2_alpha/_base.py | 3 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/register.py | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/synapse/rest/client/v2_alpha/_base.py b/synapse/rest/client/v2_alpha/_base.py index db2c9b244a..8adcc9dd95 100644 --- a/synapse/rest/client/v2_alpha/_base.py +++ b/synapse/rest/client/v2_alpha/_base.py @@ -42,10 +42,11 @@ def client_v2_pattern(path_regex): def parse_request_allow_empty(request): content = request.content.read() - if content == None or content == '': + if content is None or content == '': return None return simplejson.loads(content) + def parse_json_dict_from_request(request): try: content = simplejson.loads(request.content.read()) diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py index 84da010c29..4a53e03743 100644 --- a/synapse/rest/client/v2_alpha/register.py +++ b/synapse/rest/client/v2_alpha/register.py @@ -16,7 +16,7 @@ from twisted.internet import defer from synapse.api.constants import LoginType -from synapse.api.errors import LoginError, SynapseError, Codes +from synapse.api.errors import SynapseError, Codes from synapse.http.servlet import RestServlet from ._base import client_v2_pattern, parse_request_allow_empty @@ -83,4 +83,4 @@ class RegisterRestServlet(RestServlet): def register_servlets(hs, http_server): - RegisterRestServlet(hs).register(http_server) \ No newline at end of file + RegisterRestServlet(hs).register(http_server) |