diff options
| author | Kent Shikama <kent@kentshikama.com> | 2016-07-04 22:07:11 +0900 |
|---|---|---|
| committer | Kent Shikama <kent@kentshikama.com> | 2016-07-04 22:07:11 +0900 |
| commit | bb069079bbd0ce761403416ed4f77051352ed347 (patch) | |
| tree | 1f2556704b4e3157208f44f9a70c66581b43ec73 | |
| parent | Use .get() instead of [] to access password_hash (diff) | |
| download | synapse-bb069079bbd0ce761403416ed4f77051352ed347.tar.xz | |
Fix style violations
Signed-off-by: Kent Shikama <kent@kentshikama.com>
| -rw-r--r-- | synapse/handlers/register.py | 3 | ||||
| -rw-r--r-- | synapse/rest/client/v1/register.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index e255f2da81..88c82ba7d0 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -358,7 +358,8 @@ class RegistrationHandler(BaseHandler): defer.returnValue(data) @defer.inlineCallbacks - def get_or_create_user(self, localpart, displayname, duration_seconds, password_hash=None): + def get_or_create_user(self, localpart, displayname, duration_seconds, + password_hash=None): """Creates a new user if the user does not exist, else revokes all previous access tokens and generates a new one. diff --git a/synapse/rest/client/v1/register.py b/synapse/rest/client/v1/register.py index a923d5a198..d791d5e07e 100644 --- a/synapse/rest/client/v1/register.py +++ b/synapse/rest/client/v1/register.py @@ -410,7 +410,8 @@ class CreateUserRestServlet(ClientV1RestServlet): raise SynapseError(400, "Failed to parse 'duration_seconds'") if duration_seconds > self.direct_user_creation_max_duration: duration_seconds = self.direct_user_creation_max_duration - password_hash = user_json["password_hash"].encode("utf-8") if user_json.get("password_hash") else None + password_hash = user_json["password_hash"].encode("utf-8") \ + if user_json.get("password_hash") else None handler = self.handlers.registration_handler user_id, token = yield handler.get_or_create_user( |