summary refs log tree commit diff
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2015-02-25 17:42:28 +0000
committerKegan Dougal <kegan@matrix.org>2015-02-25 17:42:28 +0000
commit29267cf9d7fbacdfcccaaef9160657f24b9aca14 (patch)
tree503d82d144555e87872ee3a8fd3952c0570f69ec
parentComment unused variables. (diff)
downloadsynapse-29267cf9d7fbacdfcccaaef9160657f24b9aca14.tar.xz
PEP8 and pyflakes
Diffstat (limited to '')
-rw-r--r--synapse/storage/appservice.py8
-rw-r--r--synapse/storage/directory.py1
2 files changed, 3 insertions, 6 deletions
diff --git a/synapse/storage/appservice.py b/synapse/storage/appservice.py
index c8f0ce44f4..017b6d1e86 100644
--- a/synapse/storage/appservice.py
+++ b/synapse/storage/appservice.py
@@ -229,12 +229,10 @@ class ApplicationServiceStore(SQLBaseStore):
             r.room_id for r in room_alias_mappings if
             service.is_interested_in_alias(r.room_alias)
         ]
+        logging.debug(matching_alias_list)
+        logging.debug(matching_room_id_list)
 
-        # get all rooms for every user for this AS.
-
-        # TODO stub
-        yield self.cache_defer
-
+        # TODO get all rooms for every user for this AS.
 
         defer.returnValue([RoomsForUser("!foo:bar", service.sender, "join")])
 
diff --git a/synapse/storage/directory.py b/synapse/storage/directory.py
index 70c8c8ccd3..e391239a3c 100644
--- a/synapse/storage/directory.py
+++ b/synapse/storage/directory.py
@@ -155,7 +155,6 @@ class DirectoryStore(SQLBaseStore):
             ) for r in results
         ])
 
-
     def get_aliases_for_room(self, room_id):
         return self._simple_select_onecol(
             "room_aliases",