Changeset 15be53 in indico

Timestamp:

06/18/12 13:29:26 (11 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

41e338

Parents:

baa19f

git-author:

Jose Benito <jose.benito.gonzalez@…> (06/18/12 13:27:47)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (06/18/12 13:29:26)

Message:

[FIX] ical html filter raises exception

This happens when there is a \r\n (of any combination of it), or a white space.

File:

• indico/web/http_api/ical.py (modified) (1 diff)

indico/web/http_api/ical.py

@@ -75 +75 @@
 
     if fossil['description']:
-        description += "Description: " + html.fromstring(fossil.get('description', "<p/>").decode('utf-8')).text_content() \
+        desc_text = fossil.get('description', '').strip()
+        if not desc_text:
+            desc_text = '<p/>'
+        description += "Description: " + html.fromstring(desc_text.decode('utf-8')).text_content() \
                     + '\nURL: ' + fossil['url']
     else: