Merge branch 'psycopg2' into content_generation

[dak.git] / dak / show_deferred.py

diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index 833cad282992fe94b1f400294627f8de9dba4b32..e9266bcc03f4aa33a60483b9dc24779e5b146323 100755 (executable)
--- a/dak/show_deferred.py
+++ b/dak/show_deferred.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# based on queue-report
+""" Overview of the DEFERRED queue, based on queue-report """
 #    Copyright (C) 2001, 2002, 2003, 2005, 2006  James Troup <james@nocrew.org>
 # Copyright (C) 2008 Thomas Viehmann <tv@beamnet.de>
 
@@ -27,6 +27,7 @@ from debian_bundle import deb822
 from daklib import database
 from daklib import queue
 from daklib import utils
+from daklib.regexes import re_html_escaping, html_escaping
 
 ################################################################################
 ### work around bug #487902 in debian-python 0.1.10
@@ -40,8 +41,6 @@ deb822.Changes._multivalued_fields = {
 
 row_number = 1
 
-html_escaping = {'"':'&quot;', '&':'&amp;', '<':'&lt;', '>':'&gt;'}
-re_html_escaping = re.compile('|'.join(map(re.escape, html_escaping.keys())))
 def html_escape(s):
     return re_html_escaping.sub(lambda x: html_escaping.get(x.group(0)), s)