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/rest/media/v1 | |
| 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/rest/media/v1')
| -rw-r--r-- | synapse/rest/media/v1/_base.py | 2 | ||||
| -rw-r--r-- | synapse/rest/media/v1/media_repository.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/media/v1/_base.py b/synapse/rest/media/v1/_base.py index e7ac01da01..d9c4af9389 100644 --- a/synapse/rest/media/v1/_base.py +++ b/synapse/rest/media/v1/_base.py @@ -28,7 +28,7 @@ import os import logging import urllib -import urlparse +from six.moves.urllib import parse as urlparse logger = logging.getLogger(__name__) diff --git a/synapse/rest/media/v1/media_repository.py b/synapse/rest/media/v1/media_repository.py index bb79599379..9800ce7581 100644 --- a/synapse/rest/media/v1/media_repository.py +++ b/synapse/rest/media/v1/media_repository.py @@ -47,7 +47,7 @@ import shutil import cgi import logging -import urlparse +from six.moves.urllib import parse as urlparse logger = logging.getLogger(__name__) |