X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fexamine_package.py;h=c7ab7ad5865c8d9619cd9951acc8086e2610bbad;hb=f8a0c616c5fb38451273419a53380c42522ab9d0;hp=3161428de9919f9563a86752a1cb108cb858831b;hpb=b07852aa10727e959844a3f3b4d5b8a6bce00dbf;p=dak.git

diff --git a/dak/examine_package.py b/dak/examine_package.py
index 3161428d..c7ab7ad5 100755
--- a/dak/examine_package.py
+++ b/dak/examine_package.py
@@ -34,7 +34,8 @@
 
 import errno, os, pg, re, sys, md5
 import apt_pkg, apt_inst
-import daklib.database, daklib.utils, daklib.queue
+from daklib import database
+from daklib import utils
 
 ################################################################################
 
@@ -54,17 +55,14 @@ re_version = re.compile('^(.*)\((.*)\)')
 re_newlinespace = re.compile('\n')
 re_spacestrip = re.compile('(\s)')
 
-html_escaping = {'"':'&quot;', '&':'&amp;', '<':'&lt;', '>':'&gt;'}
-re_html_escaping = re.compile('|'.join(map(re.escape, html_escaping.keys())))
-
 ################################################################################
 
 Cnf = None
 projectB = None
 
-Cnf = daklib.utils.get_conf()
+Cnf = utils.get_conf()
 projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
-daklib.database.init(Cnf, projectB)
+database.init(Cnf, projectB)
 
 printed_copyrights = {}
 
@@ -88,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
 
@@ -102,9 +97,9 @@ def headline(s, level=2, bodyelement=None):
         if bodyelement:
             print """<thead>
                 <tr><th colspan="2" class="title" onclick="toggle('%(bodyelement)s', 'table-row-group', 'table-row-group')">%(title)s <span class="toggle-msg">(click to toggle)</span></th></tr>
-              </thead>"""%{"bodyelement":bodyelement,"title":html_escape(s)}
+              </thead>"""%{"bodyelement":bodyelement,"title":utils.html_escape(s)}
         else:
-            print "<h%d>%s</h%d>" % (level, html_escape(s), level)
+            print "<h%d>%s</h%d>" % (level, utils.html_escape(s), level)
     else:
         print "---- %s ----" % (s)
 
@@ -129,7 +124,7 @@ html_colours = {
 
 def colour_output(s, colour):
     if use_html:
-        return ("%s%s%s" % (html_colours[colour][0], html_escape(s), html_colours[colour][1]))
+        return ("%s%s%s" % (html_colours[colour][0], utils.html_escape(s), html_colours[colour][1]))
     else:
         return ("%s%s%s" % (ansi_colours[colour], s, ansi_colours['end']))
 
@@ -145,7 +140,7 @@ def formatted_text(s, strip=False):
     if use_html:
         if strip:
             s = s.strip()
-        return "<pre>%s</pre>" % (html_escape(s))
+        return "<pre>%s</pre>" % (utils.html_escape(s))
     else:
         return s
 
@@ -225,7 +220,7 @@ def read_control (filename):
     maintainer = ''
     arch = ''
 
-    deb_file = daklib.utils.open_file(filename)
+    deb_file = utils.open_file(filename)
     try:
         extracts = apt_inst.debExtractControl(deb_file)
         control = apt_pkg.ParseSection(extracts)
@@ -279,9 +274,9 @@ def read_control (filename):
 def read_changes_or_dsc (filename):
     dsc = {}
 
-    dsc_file = daklib.utils.open_file(filename)
+    dsc_file = utils.open_file(filename)
     try:
-        dsc = daklib.utils.parse_changes(filename)
+        dsc = utils.parse_changes(filename)
     except:
         return formatted_text("can't parse .dsc control info")
     dsc_file.close()
@@ -457,7 +452,7 @@ def check_deb (deb_filename):
 # Read a file, strip the signature and return the modified contents as
 # a string.
 def strip_pgp_signature (filename):
-    file = daklib.utils.open_file (filename)
+    file = utils.open_file (filename)
     contents = ""
     inside_signature = 0
     skip_next = 0
@@ -489,8 +484,8 @@ def display_changes(changes_filename):
 def check_changes (changes_filename):
     display_changes(changes_filename)
 
-    changes = daklib.utils.parse_changes (changes_filename)
-    files = daklib.utils.build_file_list(changes)
+    changes = utils.parse_changes (changes_filename)
+    files = utils.build_file_list(changes)
     for f in files.keys():
         if f.endswith(".deb") or f.endswith(".udeb"):
             check_deb(f)
@@ -501,7 +496,7 @@ def check_changes (changes_filename):
 def main ():
     global Cnf, projectB, db_files, waste, excluded
 
-#    Cnf = daklib.utils.get_conf()
+#    Cnf = utils.get_conf()
 
     Arguments = [('h',"help","Examine-Package::Options::Help"),
                  ('H',"html-output","Examine-Package::Options::Html-Output"),
@@ -533,7 +528,7 @@ def main ():
                 elif f.endswith(".dsc"):
                     check_dsc(f)
                 else:
-                    daklib.utils.fubar("Unrecognised file type: '%s'." % (f))
+                    utils.fubar("Unrecognised file type: '%s'." % (f))
             finally:
                 if not Options["Html-Output"]:
                     # Reset stdout here so future less invocations aren't FUBAR
@@ -541,12 +536,12 @@ def main ():
                     sys.stdout = stdout_fd
         except IOError, e:
             if errno.errorcode[e.errno] == 'EPIPE':
-                daklib.utils.warn("[examine-package] Caught EPIPE; skipping.")
+                utils.warn("[examine-package] Caught EPIPE; skipping.")
                 pass
             else:
                 raise
         except KeyboardInterrupt:
-            daklib.utils.warn("[examine-package] Caught C-c; skipping.")
+            utils.warn("[examine-package] Caught C-c; skipping.")
             pass
 
 #######################################################################################