summary refs log tree commit diff
path: root/synapse/replication
diff options
context:
space:
mode:
authorAdrian Tschira <nota@notafile.com>2018-04-28 12:17:56 +0200
committerAdrian Tschira <nota@notafile.com>2018-04-28 13:41:41 +0200
commit57b58e2174f120fb13fbe2f6d57e8647b69921ec (patch)
treebd1f59843692196bcebc6756b710d939f49628bf /synapse/replication
parentMerge pull request #3127 from matrix-org/rav/deferred_timeout (diff)
downloadsynapse-57b58e2174f120fb13fbe2f6d57e8647b69921ec.tar.xz
make imports local
Signed-off-by: Adrian Tschira <nota@notafile.com>
Diffstat (limited to 'synapse/replication')
-rw-r--r--synapse/replication/tcp/protocol.py4
-rw-r--r--synapse/replication/tcp/resource.py4
2 files changed, 4 insertions, 4 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 diff --git a/synapse/replication/tcp/resource.py b/synapse/replication/tcp/resource.py
index 786c3fe864..a41af4fd6c 100644 --- a/synapse/replication/tcp/resource.py +++ b/synapse/replication/tcp/resource.py
@@ -18,8 +18,8 @@ from twisted.internet import defer, reactor from twisted.internet.protocol import Factory -from streams import STREAMS_MAP, FederationStream -from protocol import ServerReplicationStreamProtocol +from .streams import STREAMS_MAP, FederationStream +from .protocol import ServerReplicationStreamProtocol from synapse.util.metrics import Measure, measure_func