diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-07-19 12:57:39 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-07-19 12:57:39 +0100 |
commit | ef2188c1bfd532ddc2e4c1acb533b422afde6c57 (patch) | |
tree | a9483e827cfabebcbb422c9a6426b53f928f3d31 /synapse/storage/keys.py | |
parent | d24e9b285fd8d602c3b12c6ba589da0dd2cddee3 (diff) |
Imported Upstream version 0.33.0
Diffstat (limited to 'synapse/storage/keys.py')
-rw-r--r-- | synapse/storage/keys.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/synapse/storage/keys.py b/synapse/storage/keys.py index 0f13b61d..f5479776 100644 --- a/synapse/storage/keys.py +++ b/synapse/storage/keys.py @@ -13,17 +13,19 @@ # See the License for the specific language governing permissions and # limitations under the License. -from ._base import SQLBaseStore -from synapse.util.caches.descriptors import cachedInlineCallbacks +import hashlib +import logging -from twisted.internet import defer import six -import OpenSSL from signedjson.key import decode_verify_key_bytes -import hashlib -import logging +import OpenSSL +from twisted.internet import defer + +from synapse.util.caches.descriptors import cachedInlineCallbacks + +from ._base import SQLBaseStore logger = logging.getLogger(__name__) |