summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-15 16:59:58 +0100
committerErik Johnston <erik@matrix.org>2015-05-15 16:59:58 +0100
commitc3b37abdfd6d34ea7ff7698bd61dd37763e257b1 (patch)
tree5432afc08fd1364896f208e1b6c067effc36a532
parentRevert limiting of fetching, it didn't help perf. (diff)
downloadsynapse-c3b37abdfd6d34ea7ff7698bd61dd37763e257b1.tar.xz
PEP8
-rw-r--r--synapse/storage/_base.py1
-rw-r--r--synapse/storage/events.py2
2 files changed, 1 insertions, 2 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index 5d86aa5cd4..b529e0543e 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -27,7 +27,6 @@ from twisted.internet import defer
 
 from collections import namedtuple, OrderedDict
 
-import contextlib
 import functools
 import sys
 import time
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index 98a5663932..25fb49a28d 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -629,7 +629,7 @@ class EventsStore(SQLBaseStore):
 
     @defer.inlineCallbacks
     def _fetch_events(self, txn, events, check_redacted=True,
-                     get_prev_content=False, allow_rejected=False):
+                      get_prev_content=False, allow_rejected=False):
         if not events:
             defer.returnValue({})