Mercurial > public > sg101

diff core/markup.py @ 848:32ebe22f0cad
For issue #79 update to Markdown 2.5.1. This commit follows new Markdown conventions for extensions.
author: Brian Neal <bgneal@gmail.com>
date: Tue, 28 Oct 2014 19:33:14 -0500
parents: 7429c98c8ece
children: ff645a692791
--- a/core/markup.py	Mon Oct 27 18:53:07 2014 -0500
+++ b/core/markup.py	Tue Oct 28 19:33:14 2014 -0500
@@ -1,10 +1,13 @@
 """
 Markup related utitlities useful for the entire project.
+
 """
 import markdown as _markdown
 from django.utils.encoding import force_unicode
 
 from smiley import SmilifyMarkdown
+from core.mdexts.urlize import UrlizeExtension
+from core.mdexts.deleted import DelExtension
 
 class Markdown(object):
     """
@@ -13,7 +16,11 @@
     """
     def __init__(self, safe_mode='escape'):
         self.md = _markdown.Markdown(safe_mode=safe_mode,
-                                extensions=['urlize', 'nl2br', 'del'])
+                                     extensions=[
+                                         UrlizeExtension(),
+                                         'markdown.extensions.nl2br',
+                                         DelExtension(),
+                                     ])
 
     def convert(self, s):
         return self.md.convert(force_unicode(s))