diff options
| author | Travis Ralston <travpc@gmail.com> | 2018-10-18 09:57:58 -0600 |
|---|---|---|
| committer | Travis Ralston <travpc@gmail.com> | 2018-10-18 09:57:58 -0600 |
| commit | 49a044aa5f7a89594fca5556236126208ff7aa1c (patch) | |
| tree | ab8f3bdea5294ed08bad2f5ab640063fbfd479e6 /synapse/rest | |
| parent | pep8 (diff) | |
| parent | remove redundant changelog file (diff) | |
| download | synapse-49a044aa5f7a89594fca5556236126208ff7aa1c.tar.xz | |
Merge branch 'develop' into travis/login-terms
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/media/v1/preview_url_resource.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/rest/media/v1/preview_url_resource.py b/synapse/rest/media/v1/preview_url_resource.py index af01040a38..8c892ff187 100644 --- a/synapse/rest/media/v1/preview_url_resource.py +++ b/synapse/rest/media/v1/preview_url_resource.py @@ -596,10 +596,13 @@ def _iterate_over_text(tree, *tags_to_ignore): # to be returned. elements = iter([tree]) while True: - el = next(elements) + el = next(elements, None) + if el is None: + return + if isinstance(el, string_types): yield el - elif el is not None and el.tag not in tags_to_ignore: + elif el.tag not in tags_to_ignore: # el.text is the text before the first child, so we can immediately # return it if the text exists. if el.text: |