- more python 3.x fixes

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

diff --git a/TLD_Builder/bqueue.py b/TLD_Builder/bqueue.py
index e8877524f6e3a373257d652e6243bf9239591574..d5b183f8c8aac24fb85662c5af38012103380f7e 100644 (file)
--- a/TLD_Builder/bqueue.py
+++ b/TLD_Builder/bqueue.py
@@ -35,7 +35,7 @@ class B_Queue:
         f.flush()
         os.fsync(f.fileno())
         f.close()
-        os.chmod(tmpfname, 0644)
+        os.chmod(tmpfname, 0o0644)
         os.rename(tmpfname, fname)
 
     def dump_html(self, fname):
@@ -66,7 +66,7 @@ class B_Queue:
         f.flush()
         os.fsync(f.fileno())
         f.close()
-        os.chmod(tmpfname, 0644)
+        os.chmod(tmpfname, 0o0644)
         os.rename(tmpfname, fname)
 
     # read possibly compressed, signed queue
@@ -90,7 +90,7 @@ class B_Queue:
         self._open()
         self.signers = []
         body = self.fd.read()
-        if string.strip(body) == "":
+        if body.strip() == "":
             # empty file, don't choke
             self.requests = []
             return
@@ -128,7 +128,7 @@ class B_Queue:
         fcntl.flock(self.fd, fcntl.LOCK_UN)
 
     def write_signed(self, name):
-        sio = StringIO.StringIO()
+        sio = StringIO()
         self._write_to(sio)
         sio.seek(0)
         sio.write(gpg.sign(sio.read()))
@@ -144,7 +144,7 @@ class B_Queue:
         f.flush()
         os.fsync(f.fileno())
         f.close()
-        os.chmod(tmpname, 0644)
+        os.chmod(tmpname, 0o0644)
         os.rename(tmpname, name)
 
     def add(self, req):