From: Joerg Jaspert <joerg@debian.org>
Date: Tue, 27 Oct 2009 21:20:04 +0000 (+0100)
Subject: Merge commit 'lamby/master' into merge
X-Git-Tag: debian-r/squeeze~991
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c803426b47f44dbf31049cb85a5f086e1210128a;hp=3d76c4840aa796f7bd2d77a92e5c1de2c64f84fc;p=dak.git

Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Add fixes for broken prefix_multi_line_string calls.
  Remove unused imports from daklib.
  Use more Pythonic "".join over str.join

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/daklib/database.py b/daklib/database.py
index cbdfad04..dc950f58 100755
--- a/daklib/database.py
+++ b/daklib/database.py
@@ -30,9 +30,6 @@
 
 ################################################################################
 
-import sys
-import time
-import types
 import utils
 import pg
 
diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 850c10d8..56ff65aa 100755
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -39,7 +39,7 @@ import traceback
 
 from inspect import getargspec
 
-from sqlalchemy import create_engine, Table, MetaData, select
+from sqlalchemy import create_engine, Table, MetaData
 from sqlalchemy.orm import sessionmaker, mapper, relation
 
 # Don't remove this, we re-export the exceptions to scripts which import us
diff --git a/daklib/queue.py b/daklib/queue.py
index b3247ee1..cbdf57a3 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -26,7 +26,6 @@ Queue utility functions for dak
 
 ###############################################################################
 
-import cPickle
 import errno
 import os
 import pg
@@ -1070,7 +1069,7 @@ class Upload(object):
         (result, output) = commands.getstatusoutput(cmd)
         if (result != 0):
             self.rejects.append("'dpkg-source -x' failed for %s [return code: %s]." % (dsc_filename, result))
-            self.rejects.append(utils.prefix_multi_line_string(output, " [dpkg-source output:] "), "")
+            self.rejects.append(utils.prefix_multi_line_string(output, " [dpkg-source output:] "))
             return
 
         if not cnf.Find("Dir::Queue::BTSVersionTrack"):
@@ -1243,7 +1242,7 @@ class Upload(object):
         os.unlink(temp_filename)
         if (result != 0):
             self.rejects.append("lintian failed for %s [return code: %s]." % (self.pkg.changes_file, result))
-            self.rejects.append(utils.prefix_multi_line_string(output, " [possible output:] "), "")
+            self.rejects.append(utils.prefix_multi_line_string(output, " [possible output:] "))
             return
 
         if len(output) == 0:
diff --git a/daklib/utils.py b/daklib/utils.py
index 40410fbb..457e093c 100755
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -22,7 +22,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-import codecs
 import commands
 import email.Header
 import os
@@ -46,8 +45,8 @@ from dak_exceptions import *
 from textutils import fix_maintainer
 from regexes import re_html_escaping, html_escaping, re_single_line_field, \
                     re_multi_line_field, re_srchasver, re_verwithext, \
-                    re_parse_maintainer, re_taint_free, re_gpg_uid, \
-                    re_re_mark, re_whitespace_comment, re_issource
+                    re_taint_free, re_gpg_uid, re_re_mark, \
+                    re_whitespace_comment, re_issource
 
 from srcformats import srcformats
 from collections import defaultdict
@@ -69,7 +68,7 @@ def dak_getstatusoutput(cmd):
     pipe = subprocess.Popen(cmd, shell=True, universal_newlines=True,
         stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
 
-    output = str.join("", pipe.stdout.readlines())
+    output = "".join(pipe.stdout.readlines())
 
     ret = pipe.wait()
     if ret is None: