X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdatabase.py;h=cbdfad04e5a4504f204210802bdc5efc9236a75f;hb=d2a4effa7138d04402928b843ca8ca4ba45e3380;hp=826e0441954ce8515968e07ee010e15900be840f;hpb=01ee51191df7ebb38160b7942530a09ec14ad538;p=dak.git

diff --git a/daklib/database.py b/daklib/database.py
index 826e0441..cbdfad04 100755
--- a/daklib/database.py
+++ b/daklib/database.py
@@ -35,7 +35,6 @@ import time
 import types
 import utils
 import pg
-from binary import Binary
 
 ################################################################################
 
@@ -80,31 +79,6 @@ def init (config, sql):
     Cnf = config
     projectB = sql
 
-
-def do_query(query):
-    """
-    Executes a database query. Writes statistics / timing to stderr.
-
-    @type query: string
-    @param query: database query string, passed unmodified
-
-    @return: db result
-
-    @warning: The query is passed B{unmodified}, so be careful what you use this for.
-    """
-    sys.stderr.write("query: \"%s\" ... " % (query))
-    before = time.time()
-    r = projectB.query(query)
-    time_diff = time.time()-before
-    sys.stderr.write("took %.3f seconds.\n" % (time_diff))
-    if type(r) is int:
-        sys.stderr.write("int result: %s\n" % (r))
-    elif type(r) is types.NoneType:
-        sys.stderr.write("result: None\n")
-    else:
-        sys.stderr.write("pgresult: %s\n" % (r.getresult()))
-    return r
-
 ################################################################################
 
 def get_suite_id (suite):
@@ -875,8 +849,8 @@ def has_new_comment(package, version, ignore_trainee=False):
     @type version: string
     @param version: package version
 
-    @type version: boolean
-    @param version: ignore trainee comments
+    @type ignore_trainee: boolean
+    @param ignore_trainee: ignore trainee comments
 
     @rtype: boolean
     @return: true/false