diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-25 16:23:06 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-25 16:23:06 +0100 |
| commit | a0b181bd17cb7ec2a43ed2dbdeb1bb40f3f4373c (patch) | |
| tree | 7f136968479fe90438c30e252d364fd4fd72fc01 /synapse/rest/client/v1/directory.py | |
| parent | Merge pull request #244 from matrix-org/markjh/refresh_tokens (diff) | |
| download | synapse-a0b181bd17cb7ec2a43ed2dbdeb1bb40f3f4373c.tar.xz | |
Remove completely unused concepts from codebase
Removes device_id and ClientInfo device_id is never actually written, and the matrix.org DB has no non-null entries for it. Right now, it's just cluttering up code. This doesn't remove the columns from the database, because that's fiddly.
Diffstat (limited to 'synapse/rest/client/v1/directory.py')
| -rw-r--r-- | synapse/rest/client/v1/directory.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/directory.py b/synapse/rest/client/v1/directory.py index 6758a888b3..4dcda57c1b 100644 --- a/synapse/rest/client/v1/directory.py +++ b/synapse/rest/client/v1/directory.py @@ -69,7 +69,7 @@ class ClientDirectoryServer(ClientV1RestServlet): try: # try to auth as a user - user, client = yield self.auth.get_user_by_req(request) + user, _ = yield self.auth.get_user_by_req(request) try: user_id = user.to_string() yield dir_handler.create_association( @@ -116,7 +116,7 @@ class ClientDirectoryServer(ClientV1RestServlet): # fallback to default user behaviour if they aren't an AS pass - user, client = yield self.auth.get_user_by_req(request) + user, _ = yield self.auth.get_user_by_req(request) is_admin = yield self.auth.is_server_admin(user) if not is_admin: |