diff options
| -rw-r--r-- | scripts-dev/federation_client.py | 1 | ||||
| -rw-r--r-- | synapse/rest/media/v1/preview_url_resource.py | 3 | ||||
| -rw-r--r-- | synapse/storage/events.py | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/scripts-dev/federation_client.py b/scripts-dev/federation_client.py index 59c3dce3d7..d1ab42d3af 100644 --- a/scripts-dev/federation_client.py +++ b/scripts-dev/federation_client.py @@ -143,6 +143,7 @@ def main(): ) json.dump(result, sys.stdout) + print "" if __name__ == "__main__": main() diff --git a/synapse/rest/media/v1/preview_url_resource.py b/synapse/rest/media/v1/preview_url_resource.py index 4060593f7f..bdd0e60c5b 100644 --- a/synapse/rest/media/v1/preview_url_resource.py +++ b/synapse/rest/media/v1/preview_url_resource.py @@ -345,7 +345,8 @@ class PreviewUrlResource(Resource): # lines) text_nodes = ( re.sub(r'\s+', '\n', el.text).strip() - for el in cloned_tree.iter() if el.text + for el in cloned_tree.iter() + if el.text and isinstance(el.tag, basestring) # Removes comments ) og['og:description'] = summarize_paragraphs(text_nodes) diff --git a/synapse/storage/events.py b/synapse/storage/events.py index e4dbaa3547..d2feee8dbb 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -350,7 +350,7 @@ class EventsStore(SQLBaseStore): ) if not events and not allow_none: - raise RuntimeError("Could not find event %s" % (event_id,)) + raise SynapseError(404, "Could not find event %s" % (event_id,)) defer.returnValue(events[0] if events else None) |