Fix outdated syntax

[projects/pld-builder.new.git] / PLD_Builder / bqueue.py
diff --git a/PLD_Builder/bqueue.py b/PLD_Builder/bqueue.py

index ce895a1437a0a8e67c6256cd80681aea30333a9a..395e32fa7e0e10d44ee4da1d1e0092f91731038d 100644 (file)
--- a/PLD_Builder/bqueue.py
+++ b/PLD_Builder/bqueue.py
@@ -3,7 +3,11 @@
  import re
  import gzip
  import time
-import StringIO
+import sys
+if sys.version_info[0] == 2:
+    import StringIO
+else:
+    from io import StringIO
  import os
  import fcntl
  import string
@@ -22,10 +26,11 @@ class B_Queue:
          self.fd = None
  
      def dump(self, fname):
-        (f, tmpfname) = tempfile.mkstemp(dir=os.path.dirname(fname))
+        (fdno, tmpfname) = tempfile.mkstemp(dir=os.path.dirname(fname))
+        f = os.fdopen(fdno, "w")
          self.requests.reverse()
-            for r in self.requests:
-                r.dump(f)
+        for r in self.requests:
+            r.dump(f)
          self.requests.reverse()
          f.flush()
          os.fsync(f.fileno())
@@ -34,22 +39,30 @@ class B_Queue:
          os.rename(tmpfname, fname)
  
      def dump_html(self, fname):
-        (f, tmpfname) = tempfile.mkstemp(dir=os.path.dirname(fname))
+        (fdno, tmpfname) = tempfile.mkstemp(dir=os.path.dirname(fname))
+        f = os.fdopen(fdno, "w")
          f.write("""
  <html>
      <head>
-    <link rel="Shortcut Icon" href="http://www.pld-linux.org/favicon.ico"/>
+    <link rel="Shortcut Icon" href="//www.pld-linux.org/favicon.ico"/>
          <title>PLD builder queue</title>
          <link rel="stylesheet" type="text/css" charset="utf-8" media="all" href="style.css">
+        <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+        <script src="//cdnjs.cloudflare.com/ajax/libs/jquery-timeago/1.4.3/jquery.timeago.min.js"></script>
          <script type="text/javascript" src="script.js"></script>
      </head>
-<body>\n"""
+<body>
+<div id="header">
+    <div id="requesters-filter">Filter by requesters:<br></div>
+</div>
+<div id="content">
+"""
          )
          self.requests.reverse()
          for r in self.requests:
              r.dump_html(f)
          self.requests.reverse()
-        f.write("</body></html>\n")
+        f.write("</div></body></html>\n")
          f.flush()
          os.fsync(f.fileno())
          f.close()
@@ -72,7 +85,7 @@ class B_Queue:
                  self.fd = open(self.name, "r+")
              else:
                  self.fd = open(self.name, "w+")
-        
+
      def read(self):
          self._open()
          self.signers = []
@@ -83,7 +96,7 @@ class B_Queue:
              return
          try:
              self.requests = request.parse_requests(body)
-        except Exception, e:
+        except Exception as e:
              log.panic("error parsing %s: %s" % (self.name, e))
              pass
  
@@ -110,7 +123,7 @@ class B_Queue:
              return 1
          except IOError:
              return 0
-    
+
      def unlock(self):
          fcntl.flock(self.fd, fcntl.LOCK_UN)
  
@@ -120,7 +133,8 @@ class B_Queue:
          sio.seek(0)
          sio.write(gpg.sign(sio.read()))
          sio.seek(0)
-        (f, tmpname) = tempfile.mkstemp(dir=os.path.dirname(name))
+        (fdno, tmpname) = tempfile.mkstemp(dir=os.path.dirname(name))
+        f = os.fdopen(fdno, "w")
          if re.search(r"\.gz$", name):
              fgz = gzip.GzipFile(filename=name, mode="w", compresslevel=6, fileobj=f)
              util.sendfile(sio, fgz)
@@ -131,7 +145,7 @@ class B_Queue:
          os.fsync(f.fileno())
          f.close()
          os.chmod(tmpname, 0644)
-        os.rename(tmpfname, name)
+        os.rename(tmpname, name)
  
      def add(self, req):
          self.requests.append(req)