summary refs log tree commit diff
path: root/synapse/storage/keys.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-03-08 18:11:10 +0000
committerMark Haines <mjark@negativecurvature.net>2016-03-08 18:11:10 +0000
commit5f5817ab05764603f9ca1b74261d9dd42fe55cfb (patch)
treedf763543528231bf10ce1b7925a55da5ba211820 /synapse/storage/keys.py
parentMerge pull request #633 from matrix-org/daniel/ick (diff)
parentFix relative imports so they work in both py3 and py27 (diff)
downloadsynapse-5f5817ab05764603f9ca1b74261d9dd42fe55cfb.tar.xz
Merge pull request #632 from matrix-org/markjh/py3v2
Fix relative imports so they work in both py3 and py27
Diffstat (limited to 'synapse/storage/keys.py')
-rw-r--r--synapse/storage/keys.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/keys.py b/synapse/storage/keys.py

index fd05bfe54e..a495a8a7d9 100644 --- a/synapse/storage/keys.py +++ b/synapse/storage/keys.py
@@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from _base import SQLBaseStore +from ._base import SQLBaseStore from synapse.util.caches.descriptors import cachedInlineCallbacks from twisted.internet import defer