summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-10-28 16:45:57 +0000
committerMark Haines <mark.haines@matrix.org>2015-10-28 16:45:57 +0000
commita89b86dc473f5dc41a17207a17165b27d8f599ea (patch)
tree135047233f3047738b6dc93e3826aa3c4aafe000
parentAdd APIs for adding and removing tags from rooms (diff)
downloadsynapse-a89b86dc473f5dc41a17207a17165b27d8f599ea.tar.xz
Fix pyflakes errors
-rw-r--r--synapse/rest/client/v2_alpha/tags.py2
-rw-r--r--synapse/storage/tags.py6
2 files changed, 5 insertions, 3 deletions
diff --git a/synapse/rest/client/v2_alpha/tags.py b/synapse/rest/client/v2_alpha/tags.py
index c4a670c5a7..15c9347fc1 100644
--- a/synapse/rest/client/v2_alpha/tags.py
+++ b/synapse/rest/client/v2_alpha/tags.py
@@ -16,6 +16,7 @@
 from ._base import client_v2_pattern
 
 from synapse.http.servlet import RestServlet
+from synapse.api.errors import AuthError
 
 from twisted.internet import defer
 
@@ -56,6 +57,7 @@ class TagServlet(RestServlet):
     PATTERN = client_v2_pattern(
         "/user/(?P<user_id>[^/]*)/rooms/(?P<room_id>[^/]*)/tags/(?P<tag>[^/]*)"
     )
+
     def __init__(self, hs):
         super(TagServlet, self).__init__()
         self.auth = hs.get_auth()
diff --git a/synapse/storage/tags.py b/synapse/storage/tags.py
index 507e60596f..64c65fc321 100644
--- a/synapse/storage/tags.py
+++ b/synapse/storage/tags.py
@@ -84,7 +84,7 @@ class TagsStore(SQLBaseStore):
         results = {}
         if room_ids:
             tags_by_room = yield self.get_tags_for_user(self, user_id)
-            for room_id in rooms_ids:
+            for room_id in room_ids:
                 results[room_id] = tags_by_room[room_id]
 
         defer.returnValue(results)
@@ -117,7 +117,7 @@ class TagsStore(SQLBaseStore):
             )
             try:
                 txn.execute(sql, (user_id, room_id, tag))
-            except database_engine.module.IntegrityError as e:
+            except self.database_engine.module.IntegrityError:
                 # Return early if the row is already in the table
                 # and we don't need to bump the revision number of the
                 # private_user_data.
@@ -180,7 +180,7 @@ class TagsStore(SQLBaseStore):
             )
             try:
                 txn.execute(insert_sql, (user_id, room_id, next_id))
-            except database_engine.module.IntegrityError as e:
+            except self.database_engine.module.IntegrityError:
                 # Ignore insertion errors. It doesn't matter if the row wasn't
                 # inserted because if two updates happend concurrently the one
                 # with the higher stream_id will not be reported to a client