- python 3.x fixes

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

diff --git a/TLD_Builder/bqueue.py b/TLD_Builder/bqueue.py
index f95f0f394816a4a4a1749333544af9ff10b4c9c7..eab166d18c1dfdb9ce6c47cf6a0f7e281a32cad9 100644 (file)
--- a/TLD_Builder/bqueue.py
+++ b/TLD_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
@@ -31,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):
@@ -62,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
@@ -86,13 +90,13 @@ 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
         try:
             self.requests = request.parse_requests(body)
-        except Exception, e:
+        except Exception as e:
             log.panic("error parsing %s: %s" % (self.name, e))
             pass
 
@@ -140,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):