summary refs log tree commit diff
path: root/synapse/replication/tcp/protocol.py
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/replication/tcp/protocol.py
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/replication/tcp/protocol.py')
-rw-r--r--synapse/replication/tcp/protocol.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/replication/tcp/protocol.py b/synapse/replication/tcp/protocol.py

index 0a9a290af4..d7d38464b2 100644 --- a/synapse/replication/tcp/protocol.py +++ b/synapse/replication/tcp/protocol.py
@@ -53,12 +53,12 @@ from twisted.internet import defer from twisted.protocols.basic import LineOnlyReceiver from twisted.python.failure import Failure -from commands import ( +from .commands import ( COMMAND_MAP, VALID_CLIENT_COMMANDS, VALID_SERVER_COMMANDS, ErrorCommand, ServerCommand, RdataCommand, PositionCommand, PingCommand, NameCommand, ReplicateCommand, UserSyncCommand, SyncCommand, ) -from streams import STREAMS_MAP +from .streams import STREAMS_MAP from synapse.util.stringutils import random_string from synapse.metrics.metric import CounterMetric