- more python 3.x fixes

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

diff --git a/TLD_Builder/request.py b/TLD_Builder/request.py
index 2e1e7c3d094e951bfe44401bd331e9bbfb68ebb1..efedbb96fb23fc59f3c3f8b55a5b6aaa9f77b512 100644 (file)
--- a/TLD_Builder/request.py
+++ b/TLD_Builder/request.py
@@ -110,7 +110,7 @@ class Group:
     def dump(self, f):
         f.write("group: %d (id=%s pri=%d)\n" % (self.no, self.id, self.priority))
         f.write("  from: %s\n" % self.requester)
-        f.write("  flags: %s\n" % string.join(self.flags))
+        f.write("  flags: %s\n" % self.flags.join())
         f.write("  time: %s\n" % time.asctime(time.localtime(self.time)))
         for b in self.batches:
             b.dump(f)
@@ -148,7 +148,7 @@ class Group:
             'requester': escape(self.requester),
             'priority': self.priority,
             'max_jobs': self.max_jobs,
-            'flags': string.join(self.flags)
+            'flags': self.flags.join()
         })
         f.write("<ol>\n")
         for b in self.batches:
@@ -162,7 +162,7 @@ class Group:
          <requester email='%s'>%s</requester>
          <time>%d</time>
          <priority>%d</priority>
-         <maxjobs>%d</maxjobs>\n""" % (self.id, self.no, string.join(self.flags),
+         <maxjobs>%d</maxjobs>\n""" % (self.id, self.no, self.flags.join(),
                     escape(self.requester_email), escape(self.requester),
                     self.time, self.priority, self.max_jobs))
         for b in self.batches:
@@ -294,7 +294,7 @@ class Batch:
         builders = []
         for b in self.builders:
             builders.append("%s:%s" % (b, self.builders_status[b]))
-        f.write("    builders: %s\n" % string.join(builders))
+        f.write("    builders: %s\n" % builders.join())
 
     def is_command(self):
         return self.command != ""
@@ -401,7 +401,7 @@ class Batch:
                     'tooltip' : cgi.escape(tooltip, True),
             }
             + link_post)
-        f.write("%s]</small></li>\n" % string.join(builders))
+        f.write("%s]</small></li>\n" % builders.join())
 
     def rpmbuild_opts(self):
         """
@@ -501,7 +501,7 @@ class Batch:
            <spec>%s</spec>
            <branch>%s</branch>
            <info>%s</info>\n""" % (self.b_id,
-                 string.join(list(map(lambda b: b.b_id, self.depends_on))),
+                 list(map(lambda b: b.b_id, self.depends_on)).join(),
                  escape(self.src_rpm),
                  escape(' '.join(self.command_flags)), escape(self.command),
                  escape(self.spec), escape(self.branch), escape(self.info)))