diff options
| author | Adrian Tschira <nota@notafile.com> | 2018-04-30 10:44:31 +0200 |
|---|---|---|
| committer | Adrian Tschira <nota@notafile.com> | 2018-05-19 17:35:20 +0200 |
| commit | aafb0f6b0d7db313ac54a8e5e933970feae4bff3 (patch) | |
| tree | c94adaafc520a6462b727e4006bf18b0ae1a0e76 /synapse/rest/media | |
| parent | Merge pull request #3241 from matrix-org/fix_user_visits_insertion (diff) | |
| download | synapse-aafb0f6b0d7db313ac54a8e5e933970feae4bff3.tar.xz | |
py3-ize url preview
Diffstat (limited to 'synapse/rest/media')
| -rw-r--r-- | synapse/rest/media/v1/preview_url_resource.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/synapse/rest/media/v1/preview_url_resource.py b/synapse/rest/media/v1/preview_url_resource.py index 2839207abc..565cef2b8d 100644 --- a/synapse/rest/media/v1/preview_url_resource.py +++ b/synapse/rest/media/v1/preview_url_resource.py @@ -24,7 +24,9 @@ import shutil import sys import traceback import simplejson as json -import urlparse + +from six.moves import urllib_parse as urlparse +from six import string_types from twisted.web.server import NOT_DONE_YET from twisted.internet import defer @@ -590,8 +592,8 @@ def _iterate_over_text(tree, *tags_to_ignore): # to be returned. elements = iter([tree]) while True: - el = elements.next() - if isinstance(el, basestring): + el = next(elements) + if isinstance(el, string_types): yield el elif el is not None and el.tag not in tags_to_ignore: # el.text is the text before the first child, so we can immediately |