- cleanup

[tld-builder.git] / TLD_Builder / request_handler.py

diff --git a/TLD_Builder/request_handler.py b/TLD_Builder/request_handler.py
index a002a496ec15acfe758870501acdba81519e8e09..74c7f1c4d5de3b58082e90eede2ef80b85c0526c 100644 (file)
--- 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
@@ -24,7 +19,6 @@ from lock import lock
 from bqueue import B_Queue
 from config import config, init_conf
 from mailer import Message
-#import messagebus
 
 def check_double_id(id):
     id_nl = id + "\n"
@@ -104,7 +98,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 +153,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():
@@ -201,10 +195,8 @@ def handle_request(req, filename = None):
     status.push("request from %s" % user.login)
     r = request.parse_request(body)
     if r.kind == 'group':
-#        messagebus.notify(topic="request.group", user=user.login, **r.dump_json())
         handle_group(r, user)
     elif r.kind == 'notification':
-#        messagebus.notify(topic="request.notify", user=user.login, **r.dump_json())
         handle_notification(r, user)
     else:
         msg = "%s: don't know how to handle requests of this kind '%s'" \