diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-04-30 01:28:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-30 01:28:13 +0100 |
| commit | 950a32eb47272ae6f3c90c663a6d6173c7167cd5 (patch) | |
| tree | e925ddcf6878ea821de2a3656b2d38f93f65b9c0 /synapse/replication/tcp/resource.py | |
| parent | Merge pull request #3153 from NotAFile/py3-httplib (diff) | |
| parent | make imports local (diff) | |
| download | synapse-950a32eb47272ae6f3c90c663a6d6173c7167cd5.tar.xz | |
Merge pull request #3152 from NotAFile/py3-local-imports
make imports local
Diffstat (limited to 'synapse/replication/tcp/resource.py')
| -rw-r--r-- | synapse/replication/tcp/resource.py | 4 |
1 files changed, 2 insertions, 2 deletions
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 |