Fix Formatting

This commit is contained in:
Mark Haines 2015-01-27 20:19:36 +00:00
parent b19cf6a105
commit e020574d65
4 changed files with 9 additions and 14 deletions

View File

@ -181,7 +181,6 @@ class SyncHandler(BaseHandler):
limited=True,
))
@defer.inlineCallbacks
def incremental_sync_with_gap(self, sync_config, since_token):
""" Get the incremental delta needed to bring the client up to
@ -231,7 +230,6 @@ class SyncHandler(BaseHandler):
next_batch=now_token,
))
@defer.inlineCallbacks
def incremental_sync_with_gap_for_room(self, room_id, sync_config,
since_token, now_token,
@ -316,7 +314,6 @@ class SyncHandler(BaseHandler):
state = ()
defer.returnValue(state)
def compute_state_delta(self, since_token, previous_state, current_state):
""" Works out the differnce in state between the current state and the
state the client got when it last performed a sync.
@ -327,7 +324,7 @@ class SyncHandler(BaseHandler):
# after the previous sync, since we need to include those state
# updates even if they occured logically before the previous event.
# TODO(mjark) Check for new redactions in the state events.
previous_dict = {event.event_id:event for event in previous_state}
previous_dict = {event.event_id: event for event in previous_state}
state_delta = []
for event in current_state:
if event.event_id not in previous_dict:

View File

@ -214,7 +214,7 @@ class Notifier(object):
deferred = defer.Deferred()
from_token=StreamToken("s0","0","0")
from_token = StreamToken("s0", "0", "0")
listener = [_NotificationListener(
user=user,
@ -231,6 +231,7 @@ class Notifier(object):
result = yield callback()
if timeout:
timed_out = [False]
def _timeout_listener():
timed_out[0] = True
listener[0].notify(self, [], from_token, from_token)
@ -252,7 +253,6 @@ class Notifier(object):
defer.returnValue(result)
def get_events_for(self, user, rooms, pagination_config, timeout):
""" For the given user and rooms, return any new events for them. If
there are no new events wait for up to `timeout` milliseconds for any

View File

@ -68,7 +68,6 @@ class SyncRestServlet(RestServlet):
}
"""
PATTERN = client_v2_pattern("/sync$")
ALLOWED_SORT = set(["timeline,asc", "timeline,desc"])
ALLOWED_PRESENCE = set(["online", "offline", "idle"])

View File

@ -289,7 +289,6 @@ class StreamStore(SQLBaseStore):
" LIMIT ?"
)
def get_recent_events_for_room_txn(txn):
if from_token is None:
txn.execute(sql, (room_id, end_token.stream, limit,))