try to make flake8 and isort happy

This commit is contained in:
Hubert Chathi 2018-09-06 11:23:16 -04:00
parent 16a31c6fce
commit 3801b8aa03
5 changed files with 17 additions and 10 deletions

View File

@ -326,6 +326,7 @@ class RoomKeysVersionError(SynapseError):
) )
self.current_version = current_version self.current_version = current_version
class IncompatibleRoomVersionError(SynapseError): class IncompatibleRoomVersionError(SynapseError):
"""A server is trying to join a room whose version it does not support.""" """A server is trying to join a room whose version it does not support."""

View File

@ -17,7 +17,7 @@ import logging
from twisted.internet import defer 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 from synapse.util.async_helpers import Linearizer
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

View File

@ -19,8 +19,11 @@ from twisted.internet import defer
from synapse.api.errors import SynapseError from synapse.api.errors import SynapseError
from synapse.http.servlet import ( 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 from ._base import client_v2_patterns
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

View File

@ -13,10 +13,12 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from twisted.internet import defer
from synapse.api.errors import StoreError
import simplejson as json import simplejson as json
from twisted.internet import defer
from synapse.api.errors import StoreError
from ._base import SQLBaseStore from ._base import SQLBaseStore
@ -58,7 +60,7 @@ class EndToEndRoomKeyStore(SQLBaseStore):
desc="get_e2e_room_key", desc="get_e2e_room_key",
) )
row["session_data"] = json.loads(row["session_data"]); row["session_data"] = json.loads(row["session_data"])
defer.returnValue(row) defer.returnValue(row)

View File

@ -14,17 +14,18 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import mock
from synapse.api import errors
from twisted.internet import defer
import copy import copy
import mock
from twisted.internet import defer
import synapse.api.errors import synapse.api.errors
import synapse.handlers.e2e_room_keys import synapse.handlers.e2e_room_keys
import synapse.storage 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 # sample room_key data for use in the tests
room_keys = { room_keys = {