From 3801b8aa035594972c400c8bd036894a388c4ab3 Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Thu, 6 Sep 2018 11:23:16 -0400
Subject: [PATCH] try to make flake8 and isort happy

---
 synapse/api/errors.py                     |  1 +
 synapse/handlers/e2e_room_keys.py         |  2 +-
 synapse/rest/client/v2_alpha/room_keys.py |  5 ++++-
 synapse/storage/e2e_room_keys.py          |  8 +++++---
 tests/handlers/test_e2e_room_keys.py      | 11 ++++++-----
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/synapse/api/errors.py b/synapse/api/errors.py
index 3002c95dd..140dbfe8b 100644
--- a/synapse/api/errors.py
+++ b/synapse/api/errors.py
@@ -326,6 +326,7 @@ class RoomKeysVersionError(SynapseError):
         )
         self.current_version = current_version
 
+
 class IncompatibleRoomVersionError(SynapseError):
     """A server is trying to join a room whose version it does not support."""
 
diff --git a/synapse/handlers/e2e_room_keys.py b/synapse/handlers/e2e_room_keys.py
index c09816b37..2c330382c 100644
--- a/synapse/handlers/e2e_room_keys.py
+++ b/synapse/handlers/e2e_room_keys.py
@@ -17,7 +17,7 @@ import logging
 
 from twisted.internet import defer
 
-from synapse.api.errors import StoreError, SynapseError, RoomKeysVersionError
+from synapse.api.errors import RoomKeysVersionError, StoreError, SynapseError
 from synapse.util.async_helpers import Linearizer
 
 logger = logging.getLogger(__name__)
diff --git a/synapse/rest/client/v2_alpha/room_keys.py b/synapse/rest/client/v2_alpha/room_keys.py
index 9f0172e6f..1ed18e986 100644
--- a/synapse/rest/client/v2_alpha/room_keys.py
+++ b/synapse/rest/client/v2_alpha/room_keys.py
@@ -19,8 +19,11 @@ from twisted.internet import defer
 
 from synapse.api.errors import SynapseError
 from synapse.http.servlet import (
-    RestServlet, parse_json_object_from_request, parse_string
+    RestServlet,
+    parse_json_object_from_request,
+    parse_string,
 )
+
 from ._base import client_v2_patterns
 
 logger = logging.getLogger(__name__)
diff --git a/synapse/storage/e2e_room_keys.py b/synapse/storage/e2e_room_keys.py
index b695570a7..969f4aef9 100644
--- a/synapse/storage/e2e_room_keys.py
+++ b/synapse/storage/e2e_room_keys.py
@@ -13,10 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from twisted.internet import defer
-from synapse.api.errors import StoreError
 import simplejson as json
 
+from twisted.internet import defer
+
+from synapse.api.errors import StoreError
+
 from ._base import SQLBaseStore
 
 
@@ -58,7 +60,7 @@ class EndToEndRoomKeyStore(SQLBaseStore):
             desc="get_e2e_room_key",
         )
 
-        row["session_data"] = json.loads(row["session_data"]);
+        row["session_data"] = json.loads(row["session_data"])
 
         defer.returnValue(row)
 
diff --git a/tests/handlers/test_e2e_room_keys.py b/tests/handlers/test_e2e_room_keys.py
index 7fa426444..9e08eac0a 100644
--- a/tests/handlers/test_e2e_room_keys.py
+++ b/tests/handlers/test_e2e_room_keys.py
@@ -14,17 +14,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
-from synapse.api import errors
-from twisted.internet import defer
 import copy
 
+import mock
+
+from twisted.internet import defer
+
 import synapse.api.errors
 import synapse.handlers.e2e_room_keys
-
 import synapse.storage
-from tests import unittest, utils
+from synapse.api import errors
 
+from tests import unittest, utils
 
 # sample room_key data for use in the tests
 room_keys = {