bodhi.spec | 2 +-
bodhi/templates/show.kid | 8 ++------
setup.py | 1 +
3 files changed, 4 insertions(+), 7 deletions(-)
New commits:
commit 5ae630fd7295de99932b071ccfea391b3e1c8f1a
Author: Mathieu Bridon <bochecha(a)fedoraproject.org>
Date: Sat Mar 20 16:15:03 2010 +0100
Markdown module dependency.
Revision f405798d726f0102fcc8695ba7b85a9d2cedf73b introduced a dependency on the
python markdown2 module in order to display the update notes in a more
friendly way.
This turned out to not be the best idea ever. There exist 2 Python modules for
parsing Markdown syntax. The markdown2 one has some outstanding issues, and
doesn't seem to be actively developped since December 2009. The other markdown
module however works much better and is being actively developped at Gitorious.
This move fixes two recently reported issues in the process:
*
https://fedorahosted.org/bodhi/ticket/395
*
https://fedorahosted.org/fedora-infrastructure/ticket/2033
diff --git a/bodhi.spec b/bodhi.spec
index 52ab6a6..56c036d 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -58,7 +58,7 @@ Requires: python-tgcaptcha
Requires: python-decorator
Requires: mod_wsgi
Requires: httpd
-Requires: python-markdown2
+Requires: python-markdown
%description server
diff --git a/bodhi/templates/show.kid b/bodhi/templates/show.kid
index 82d1868..19c0c3d 100644
--- a/bodhi/templates/show.kid
+++ b/bodhi/templates/show.kid
@@ -13,7 +13,7 @@
from cgi import escape
from bodhi import util
from turbogears import identity
-from markdown2 import markdown
+from markdown import markdown
import re
## Link to build info and logs
@@ -39,11 +39,7 @@ release = util.link(update.release.long_name, '/' +
update.release.name)
submitter = util.link(update.submitter, '/user/' + update.submitter)
reg = re.compile(r'(^[-*] .*(?:\n[-*] .*)*)', re.MULTILINE)
-
-markdown_extras = [
- "code-friendly" # Disable _ and __ for em and strong. Underscores is a
frequent character in URLs, let's not break them.
- ]
-notes = markdown(reg.sub(r'\n\1\n', escape(update.notes)),
extras=markdown_extras)
+notes = markdown(reg.sub(r'\n\1\n', escape(update.notes)))
if update.karma < 0: karma = -1
elif update.karma > 0: karma = 1
diff --git a/setup.py b/setup.py
index d0f5972..170d17a 100755
--- a/setup.py
+++ b/setup.py
@@ -165,6 +165,7 @@ setup(
"TurboGears >= 1.0",
"TurboMail",
"python_fedora",
+ "markdown",
],
scripts = [],
data_files = data_files,