diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-07-09 10:24:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-09 10:24:43 +0100 |
| commit | 395fa8d1fd62517b00fa71004d7ebb60b6db4a17 (patch) | |
| tree | 1bedc2ecb21ebf4e29ffeb8cb50e1452965c6ce6 /synapse/storage/devices.py | |
| parent | Add an isort configuration (#3463) (diff) | |
| parent | changelog (diff) | |
| download | synapse-395fa8d1fd62517b00fa71004d7ebb60b6db4a17.tar.xz | |
Merge pull request #3464 from matrix-org/hawkowl/isort-run
Run isort on Synapse
Diffstat (limited to 'synapse/storage/devices.py')
| -rw-r--r-- | synapse/storage/devices.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/synapse/storage/devices.py b/synapse/storage/devices.py index 2ed9ada783..ec68e39f1e 100644 --- a/synapse/storage/devices.py +++ b/synapse/storage/devices.py @@ -14,15 +14,16 @@ # limitations under the License. import logging +from six import iteritems, itervalues + +from canonicaljson import json + from twisted.internet import defer from synapse.api.errors import StoreError -from ._base import SQLBaseStore, Cache -from synapse.util.caches.descriptors import cached, cachedList, cachedInlineCallbacks - -from canonicaljson import json +from synapse.util.caches.descriptors import cached, cachedInlineCallbacks, cachedList -from six import itervalues, iteritems +from ._base import Cache, SQLBaseStore logger = logging.getLogger(__name__) |