X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fexamine_package.py;h=c7ab7ad5865c8d9619cd9951acc8086e2610bbad;hb=474740a682b513d27a1d2122dffd20735e015d18;hp=81191d257616963e492512d62aa94f2e44520f3c;hpb=9678ddd39550f29a651ca1065dc0b4444e16d636;p=dak.git
diff --git a/dak/examine_package.py b/dak/examine_package.py
index 81191d25..c7ab7ad5 100755
--- a/dak/examine_package.py
+++ b/dak/examine_package.py
@@ -34,8 +34,8 @@
import errno, os, pg, re, sys, md5
import apt_pkg, apt_inst
-import daklib.database as database
-import daklib.utils as utils
+from daklib import database
+from daklib import utils
################################################################################
@@ -55,9 +55,6 @@ re_version = re.compile('^(.*)\((.*)\)')
re_newlinespace = re.compile('\n')
re_spacestrip = re.compile('(\s)')
-html_escaping = {'"':'"', '&':'&', '<':'<', '>':'>'}
-re_html_escaping = re.compile('|'.join(map(re.escape, html_escaping.keys())))
-
################################################################################
Cnf = None
@@ -89,12 +86,9 @@ PACKAGE can be a .changes, .dsc, .deb or .udeb filename."""
################################################################################
# probably xml.sax.saxutils would work as well
-def html_escape(s):
- return re_html_escaping.sub(lambda x: html_escaping.get(x.group(0)), s)
-
def escape_if_needed(s):
if use_html:
- return re_html_escaping.sub(lambda x: html_escaping.get(x.group(0)), s)
+ return utils.re_html_escaping.sub(lambda x: utils.html_escaping.get(x.group(0)), s)
else:
return s
@@ -103,9 +97,9 @@ def headline(s, level=2, bodyelement=None):
if bodyelement:
print """
- """%{"bodyelement":bodyelement,"title":html_escape(s)}
+ """%{"bodyelement":bodyelement,"title":utils.html_escape(s)}
else:
- print "%(title)s (click to toggle)
%s" % (html_escape(s)) + return "
%s" % (utils.html_escape(s)) else: return s