summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2018-10-12 11:48:56 +0100
committerDavid Baker <dave@matrix.org>2018-10-12 11:48:56 +0100
commit306361b31bc0fb229de8db29209b9da38374d6f2 (patch)
treed4e6b731d299f964dd2822d882c1887b0320f2dd
parentDon't mangle exceptions (diff)
downloadsynapse-306361b31bc0fb229de8db29209b9da38374d6f2.tar.xz
Misc PR feedback bits
-rw-r--r--synapse/storage/e2e_room_keys.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/e2e_room_keys.py b/synapse/storage/e2e_room_keys.py

index 4d439bb164..f25ded2295 100644 --- a/synapse/storage/e2e_room_keys.py +++ b/synapse/storage/e2e_room_keys.py
@@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import simplejson as json +import json from twisted.internet import defer @@ -76,7 +76,7 @@ class EndToEndRoomKeyStore(SQLBaseStore): session_id(str): the session whose room_key we're setting room_key(dict): the room_key being set Raises: - StoreError if stuff goes wrong, probably + StoreError """ yield self._simple_upsert(