- merged PLD changes, now it works with python 3.x

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

diff --git a/TLD_Builder/bqueue.py b/TLD_Builder/bqueue.py
index f95f0f394816a4a4a1749333544af9ff10b4c9c7..e8877524f6e3a373257d652e6243bf9239591574 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
@@ -92,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