diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-04-30 00:33:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-30 00:33:05 +0100 |
| commit | 9e2601f830cbd518e838fb2ef7bd75c873e9af94 (patch) | |
| tree | a9c1b32c021bd63c578f057870774dda4bef124a /synapse/http/matrixfederationclient.py | |
| parent | Merge pull request #3127 from matrix-org/rav/deferred_timeout (diff) | |
| parent | Use six.moves.urlparse (diff) | |
| download | synapse-9e2601f830cbd518e838fb2ef7bd75c873e9af94.tar.xz | |
Merge pull request #3108 from NotAFile/py3-six-urlparse
Use six.moves.urlparse
Diffstat (limited to 'synapse/http/matrixfederationclient.py')
| -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 30036fe81c..4b2b85464d 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -41,8 +41,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") |