summary refs log tree commit diff
path: root/synapse/rest/media/v1/_base.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-04-30 01:02:25 +0100
committerGitHub <noreply@github.com>2018-04-30 01:02:25 +0100
commitdb75c86e8463b130d4dcd84e79c1ebee616f9689 (patch)
treeb7c0c3e9262f8ca27470a0151cb5109472da20fa /synapse/rest/media/v1/_base.py
parentMove more xrange to six (diff)
parentMerge pull request #3085 from NotAFile/py3-config-text-mode (diff)
downloadsynapse-db75c86e8463b130d4dcd84e79c1ebee616f9689.tar.xz
Merge branch 'develop' into py3-xrange-1
Diffstat (limited to 'synapse/rest/media/v1/_base.py')
-rw-r--r--synapse/rest/media/v1/_base.py2
1 files changed, 1 insertions, 1 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__)