aboutsummaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
authorMatthew Thode <mthode@mthode.org>2015-04-03 11:07:36 -0500
committerMatthew Thode <mthode@mthode.org>2015-04-03 11:07:36 -0500
commit593331adad736e4293ec40e6dbee7f921e3b08e1 (patch)
tree31a5318d3c67c3bcda4b068a099ab0eb05811007 /web
parentmake.profile should be a symlink to portdir/profiles/default/linux/x86 now. (diff)
downloadpackages-593331adad736e4293ec40e6dbee7f921e3b08e1.tar.gz
packages-593331adad736e4293ec40e6dbee7f921e3b08e1.tar.bz2
packages-593331adad736e4293ec40e6dbee7f921e3b08e1.zip
fix for newer cherrypy (3.3.0)HEADmaster
Diffstat (limited to 'web')
-rw-r--r--web/lib/changelog_formatter.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/web/lib/changelog_formatter.py b/web/lib/changelog_formatter.py
index 536b0b0..cc67003 100644
--- a/web/lib/changelog_formatter.py
+++ b/web/lib/changelog_formatter.py
@@ -1,6 +1,6 @@
import re
import urlparse
-from cherrypy.lib.tidy import html_break
+import cgi
from web.lib.links import viewcvs_link, \
bugzilla_bug_link, \
@@ -9,6 +9,10 @@ from web.lib.links import viewcvs_link, \
# We use short variable names!
# pylint: disable-msg=C0103
+def html_break(value):
+ """New cherrypy doesn't have tidy.html_break anymore"""
+ return cgi.escape(value).replace('\n', '<br />')
+
re_author = re.compile(r' 20[01]\d; ([^<]+)? *<([^@> ]+)@[^>]')
re_author2 = re.compile(r' <?([^<@ ]+)@')
def extract_changelog_entry_author(line):