diff options
| author | Adrian Tschira <nota@notafile.com> | 2018-04-15 17:15:16 +0200 |
|---|---|---|
| committer | Adrian Tschira <nota@notafile.com> | 2018-04-15 21:22:43 +0200 |
| commit | 2a3c33ff03aa88317c30da43cd3773c2789f0fcf (patch) | |
| tree | fca219699861fab3fc172e8d0fef74ebf34f70c0 /synapse/http | |
| parent | Merge branch 'master' of https://github.com/matrix-org/synapse into develop (diff) | |
| download | synapse-2a3c33ff03aa88317c30da43cd3773c2789f0fcf.tar.xz | |
Use six.moves.urlparse
The imports were shuffled around a bunch in py3 Signed-off-by: Adrian Tschira <nota@notafile.com>
Diffstat (limited to 'synapse/http')
| -rw-r--r-- | synapse/http/matrixfederationclient.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index 60a29081e8..c2e5610f50 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -38,8 +38,7 @@ import logging import random import sys import urllib -import urlparse - +from six.moves.urllib import parse as urlparse logger = logging.getLogger(__name__) outbound_logger = logging.getLogger("synapse.http.outbound") |