summaryrefslogtreecommitdiff
path: root/synapse/rest/media/v1/_base.py
diff options
context:
space:
mode:
authorAndrej Shadura <andrewsh@debian.org>2020-07-09 08:37:25 +0200
committerAndrej Shadura <andrewsh@debian.org>2020-07-09 08:37:25 +0200
commit5c1041a8f06afe64946fb5ca055a3f20b6378556 (patch)
tree233b8175c7059613cbd3ac020f87e56c9feedda9 /synapse/rest/media/v1/_base.py
parent7da7769b791b28ac914f607ed6a08995bfe7cdef (diff)
New upstream version 1.16.0
Diffstat (limited to 'synapse/rest/media/v1/_base.py')
-rw-r--r--synapse/rest/media/v1/_base.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/rest/media/v1/_base.py b/synapse/rest/media/v1/_base.py
index 36897772..595849f9 100644
--- a/synapse/rest/media/v1/_base.py
+++ b/synapse/rest/media/v1/_base.py
@@ -16,8 +16,7 @@
import logging
import os
-
-from six.moves import urllib
+import urllib
from twisted.internet import defer
from twisted.protocols.basic import FileSender