--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/markup.py	Sat May 05 17:10:48 2012 -0500
@@ -0,0 +1,57 @@
+"""
+Markup related utitlities useful for the entire project.
+"""
+import markdown as _markdown
+from django.utils.encoding import force_unicode
+
+from smiley import SmilifyMarkdown
+
+class Markdown(object):
+    """
+    This is a thin wrapper around the Markdown class which deals with the
+    differences in Markdown versions on the production and development server.
+    This code was inspired by the code in
+    django/contrib/markup/templatetags/markup.py.
+    Currently, we only have to worry about Markdown 1.6b and 2.0.
+    """
+    def __init__(self, safe_mode='escape'):
+        # Unicode support only in markdown v1.7 or above. Version_info
+        # exists only in markdown v1.6.2rc-2 or above.
+        self.unicode_support = getattr(_markdown, "version_info", None) >= (1, 7)
+        self.md = _markdown.Markdown(safe_mode=safe_mode,
+                                extensions=['urlize', 'nl2br', 'del'])
+
+    def convert(self, s):
+        if self.unicode_support:
+            return self.md.convert(force_unicode(s))
+        else:
+            return force_unicode(self.md.convert(s))
+
+
+def markdown(s):
+    """
+    A convenience function for one-off markdown jobs.
+    """
+    md = Markdown()
+    return md.convert(s)
+
+
+class SiteMarkup(object):
+    """
+    This class provides site markup by combining markdown and
+    our own smiley markup.
+    """
+    def __init__(self):
+        self.md = Markdown()
+        self.smiley = SmilifyMarkdown()
+
+    def convert(self, s):
+        return self.md.convert(self.smiley.convert(s))
+
+
+def site_markup(s):
+    """
+    Convenience function for one-off site markup jobs.
+    """
+    sm = SiteMarkup()
+    return sm.convert(s)