From: Mike O'Connor <stew@vireo.org>
Date: Sat, 9 Jan 2010 19:30:34 +0000 (-0500)
Subject: fix errors found by epydoc
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=b37a6491aaafc34faf7be2b109f43f35393268d9;p=dak.git

fix errors found by epydoc

Signed-off-by: Mike O'Connor <stew@vireo.org>
---

diff --git a/dak/dakdb/update28.py b/dak/dakdb/update28.py
index dc39409a..042a6ac4 100755
--- a/dak/dakdb/update28.py
+++ b/dak/dakdb/update28.py
@@ -168,7 +168,7 @@ def do_update(self):
     if event == "INSERT" or event == "UPDATE":
 
        content_data = plpy.execute(plpy.prepare(
-            """SELECT s.section, b.package, b.architecture, ot.type
+            \"\"\"SELECT s.section, b.package, b.architecture, ot.type
             FROM override o
             JOIN override_type ot on o.type=ot.id
             JOIN binaries b on b.package=o.package
@@ -177,14 +177,14 @@ def do_update(self):
             JOIN section s on s.id=o.section
             WHERE b.id=$1
             AND o.suite=$2
-            """,
+            \"\"\",
             ["int", "int"]),
             [TD["new"]["bin"], TD["new"]["suite"]])[0]
 
        tablename="%s_contents" % content_data['type']
 
-       plpy.execute(plpy.prepare("""DELETE FROM %s
-                   WHERE package=$1 and arch=$2 and suite=$3""" % tablename,
+       plpy.execute(plpy.prepare(\"\"\"DELETE FROM %s
+                   WHERE package=$1 and arch=$2 and suite=$3\"\"\" % tablename,
                    ['text','int','int']),
                    [content_data['package'],
                    content_data['architecture'],
@@ -197,9 +197,9 @@ def do_update(self):
 
        for filename in filenames:
            plpy.execute(plpy.prepare(
-               """INSERT INTO %s
+               \"\"\"INSERT INTO %s
                    (filename,section,package,binary_id,arch,suite)
-                   VALUES($1,$2,$3,$4,$5,$6)""" % tablename,
+                   VALUES($1,$2,$3,$4,$5,$6)\"\"\" % tablename,
                ["text","text","text","int","int","int"]),
                [filename["file"],
                 content_data["section"],
@@ -234,9 +234,9 @@ $$ LANGUAGE plpythonu VOLATILE SECURITY DEFINER;
     event = TD["event"]
     if event == "UPDATE" or event == "INSERT":
         row = TD["new"]
-        r = plpy.execute(plpy.prepare( """SELECT 1 from suite_architectures sa
+        r = plpy.execute(plpy.prepare( \"\"\"SELECT 1 from suite_architectures sa
                   JOIN binaries b ON b.architecture = sa.architecture
-                  WHERE b.id = $1 and sa.suite = $2""",
+                  WHERE b.id = $1 and sa.suite = $2\"\"\",
                 ["int", "int"]),
                 [row["bin"], row["suite"]])
         if not len(r):
diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 88e954fe..de055bcd 100755
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -2941,7 +2941,7 @@ class DBConn(object):
                                  fingerprint = relation(Fingerprint),
                                  source_files = relation(ChangePendingFile,
                                                          secondary=self.tbl_changes_pending_source_files,
-                                                         backref="pending_sources")))
+                                                         backref="pending_sources"),
                                  files = relation(KnownChangePendingFile, backref="changesfile")))
 
         mapper(KnownChangePendingFile, self.tbl_changes_pending_files,