From 593331adad736e4293ec40e6dbee7f921e3b08e1 Mon Sep 17 00:00:00 2001
From: Matthew Thode <mthode@mthode.org>
Date: Fri, 3 Apr 2015 11:07:36 -0500
Subject: fix for newer cherrypy (3.3.0)

---
 web/lib/changelog_formatter.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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):
-- 
cgit v1.2.3-65-gdbad