summary refs log tree commit diff
path: root/synapse/push
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-04-30 01:28:13 +0100
committerGitHub <noreply@github.com>2018-04-30 01:28:13 +0100
commit950a32eb47272ae6f3c90c663a6d6173c7167cd5 (patch)
treee925ddcf6878ea821de2a3656b2d38f93f65b9c0 /synapse/push
parentMerge pull request #3153 from NotAFile/py3-httplib (diff)
parentmake imports local (diff)
downloadsynapse-950a32eb47272ae6f3c90c663a6d6173c7167cd5.tar.xz
Merge pull request #3152 from NotAFile/py3-local-imports
make imports local
Diffstat (limited to 'synapse/push')
-rw-r--r--synapse/push/httppusher.py4
-rw-r--r--synapse/push/pusher.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py

index 1420d378ef..b077e1a446 100644 --- a/synapse/push/httppusher.py +++ b/synapse/push/httppusher.py
@@ -18,8 +18,8 @@ import logging from twisted.internet import defer, reactor from twisted.internet.error import AlreadyCalled, AlreadyCancelled -import push_rule_evaluator -import push_tools +from . import push_rule_evaluator +from . import push_tools import synapse from synapse.push import PusherConfigException from synapse.util.logcontext import LoggingContext diff --git a/synapse/push/pusher.py b/synapse/push/pusher.py
index 71576330a9..5aa6667e91 100644 --- a/synapse/push/pusher.py +++ b/synapse/push/pusher.py
@@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from httppusher import HttpPusher +from .httppusher import HttpPusher import logging logger = logging.getLogger(__name__)