Catch restructuredtext exceptions, just show as text instead.

2 files changed, 30 insertions, 2 deletions

diff --git a/djangopypi/templates/djangopypi/pypi_show_links.html b/djangopypi/templates/djangopypi/pypi_show_links.html
index c2bbcc6..83142b7 100644
--- a/djangopypi/templates/djangopypi/pypi_show_links.html
+++ b/djangopypi/templates/djangopypi/pypi_show_links.html
@@ -4,8 +4,8 @@
 <p style="font-style: italic;">
 {{ project.summary }}
 </p>
-{% load markup %}
-{{ project.description|restructuredtext }}
+{% load safemarkup %}
+{{ project.description|saferst }}
 
 <br/>
 <table><thead><th>Filename</th><th>Platform</th><th>Type</th><th>Version</th><th>Uploaded On</th><th>Size</th></thead>
diff --git a/djangopypi/templatetags/safemarkup.py b/djangopypi/templatetags/safemarkup.py
new file mode 100644
index 0000000..3ecbec8
--- /dev/null
+++ b/djangopypi/templatetags/safemarkup.py
@@ -0,0 +1,28 @@
+from django import template
+from django.conf import settings
+from django.utils.encoding import smart_str, force_unicode
+from django.utils.safestring import mark_safe
+
+register = template.Library()
+
+
+def saferst(value):
+    try:
+        from docutils.core import publish_parts
+    except ImportError:
+        return force_unicode(value)
+
+    docutils_setttings = getattr(settings, "RESTRUCTUREDTEXT_FILTER_SETTINGS",
+                                 dict())
+    
+    try:
+        parts = publish_parts(source=smart_str(value),
+                              writer_name="html4css1",
+                              settings_overrides=docutils_settings)
+    except:
+        return foce_unicode(value)
+    else:
+        return mark_safe(force_unicode(parts["fragment"]))
+saferst.is_safe = True
+register.filter(saferst)
+