diff options
author | Mark Haines <mjark@negativecurvature.net> | 2016-03-08 18:11:10 +0000 |
---|---|---|
committer | Mark Haines <mjark@negativecurvature.net> | 2016-03-08 18:11:10 +0000 |
commit | 5f5817ab05764603f9ca1b74261d9dd42fe55cfb (patch) | |
tree | df763543528231bf10ce1b7925a55da5ba211820 /synapse/push/pusherpool.py | |
parent | Merge pull request #633 from matrix-org/daniel/ick (diff) | |
parent | Fix relative imports so they work in both py3 and py27 (diff) | |
download | synapse-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/push/pusherpool.py')
-rw-r--r-- | synapse/push/pusherpool.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/pusherpool.py b/synapse/push/pusherpool.py index a05aa5f661..772a095f8b 100644 --- a/synapse/push/pusherpool.py +++ b/synapse/push/pusherpool.py @@ -16,7 +16,7 @@ from twisted.internet import defer -from httppusher import HttpPusher +from .httppusher import HttpPusher from synapse.push import PusherConfigException from synapse.util.logcontext import preserve_fn |