Made markdown_short output less messy

misago/markdown/factory.py

@@ -23,10 +23,10 @@ class ClearHTMLParser(HTMLParser):
                         self.clean_text += attr[1]
         except IndexError, KeyError:
             pass
-        print "Encountered a start tag %s with attrs %s" % (tag, attrs)
         
     def handle_data(self, data):
-        self.clean_text += data
+        if self.clean_text[-len(data):] != data:
+            self.clean_text += ' %s' % data
 
 
 def clear_markdown(text):
@@ -94,4 +94,4 @@ def post_markdown(request, text):
         return _("Posted by %(user)s") % {'user': match.group('content')}
     text = re.sub(r'<quotetitle>(?P<content>.+)</quotetitle>', trans_quotetitle, text)
 
-    return text
+    return md, text

misago/template/templatetags/django2jinja.py

@@ -40,7 +40,7 @@ def parse_markdown(value, format=None):
     import markdown
     if not format:
         format = settings.OUTPUT_FORMAT
-    return markdown.markdown(value, safe_mode='escape', output_format=format)
+    return markdown.markdown(value, safe_mode='escape', output_format=format).strip()
 
 @register.filter(name='markdown_short')
 def short_markdown(value, length=300):