X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=TLD_Builder%2Frequest_handler.py;h=70a1866ff5d5e584a682b078b1a20afb869da00e;hb=9ea122b00e3a99b16246e1e38576916a2e25c0aa;hp=a002a496ec15acfe758870501acdba81519e8e09;hpb=92949e17161a53bfb4a60099e22b58ad63abce4c;p=tld-builder.git

diff --git a/TLD_Builder/request_handler.py b/TLD_Builder/request_handler.py
index a002a49..70a1866 100644
--- a/TLD_Builder/request_handler.py
+++ b/TLD_Builder/request_handler.py
@@ -5,12 +5,7 @@ import string
 import time
 import os
 import sys
-if sys.version_info[0] == 2:
-    import StringIO
-else:
-    from io import StringIO
 import fnmatch
-
 import gpg
 import request
 import log
@@ -104,7 +99,7 @@ def handle_group(r, user):
             batch.builders_status_time[bld] = time.time()
             if bld not in config.binary_builders and bld != config.builder:
                 fail_mail("I (src rpm builder '%s') do not handle binary builder '%s', only '%s'" % \
-                        (config.builder, bld, string.join(config.binary_builders)))
+                        (config.builder, bld, ' '.join(config.binary_builders)))
                 lockf.close()
                 return
             if batch.is_command():
@@ -159,7 +154,7 @@ def handle_notification(r, user):
     q = B_Queue(path.req_queue_file)
     q.lock(0)
     q.read()
-    not_fin = list(filter(lambda (r): not r.is_done(), q.requests))
+    not_fin = list(filter(lambda r: not r.is_done(), q.requests))
     r.apply_to(q)
     for r in not_fin:
         if r.is_done():