From f90b3d83a317a472188bbaddb1b167bb27ceac8a Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 17 Aug 2016 14:54:06 +0100
Subject: [PATCH] Add None check to _iterate_over_text
---
synapse/rest/media/v1/preview_url_resource.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/synapse/rest/media/v1/preview_url_resource.py b/synapse/rest/media/v1/preview_url_resource.py
index 4e4100bdec..33f35fb44e 100644
--- a/synapse/rest/media/v1/preview_url_resource.py
+++ b/synapse/rest/media/v1/preview_url_resource.py
@@ -449,7 +449,7 @@ def _iterate_over_text(tree, *tags_to_ignore):
el = elements.next()
if isinstance(el, basestring):
yield el
- elif el.tag not in tags_to_ignore:
+ 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
# return it if the text exists.
if el.text:
--
GitLab