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/rest/media/v1 | |
| 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/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__) |