- more python 3.x fixes

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

diff --git a/TLD_Builder/request_fetcher.py b/TLD_Builder/request_fetcher.py
index 6122612142a2b31bac411ee22b14e68da0e2d57c..fc9f49dac3c21a26719070d4af7d39dd9b97f604 100644 (file)
--- a/TLD_Builder/request_fetcher.py
+++ b/TLD_Builder/request_fetcher.py
@@ -29,13 +29,13 @@ from config import config, init_conf
 last_count = 0
 
 def alarmalarm(signum, frame):
-    raise IOError, 'TCP connection hung'
+    raise IOError('TCP connection hung')
 
 def has_new(control_url):
     global last_count
     cnt_f = open(path.last_req_no_file)
     try:
-        last_count = int(string.strip(cnt_f.readline()))
+        last_count = int(cnt_f.readline().strip())
     except ValueError as e:
         last_count = 0
 
@@ -48,7 +48,7 @@ def has_new(control_url):
         headers = { 'Cache-Control': 'no-cache', 'Pragma': 'no-cache' }
         req = urllib2.Request(url=control_url + "/max_req_no", headers=headers)
         f = urllib2.urlopen(req)
-        count = int(string.strip(f.readline()))
+        count = int(f.readline().strip())
         signal.alarm(0)
     except Exception as e:
         signal.alarm(0)
@@ -73,7 +73,7 @@ def fetch_queue(control_url):
         signal.alarm(0)
         log.error("can't fetch %s: %s" % (control_url + "/queue.gz", e))
         sys.exit(1)
-    sio = StringIO.StringIO()
+    sio = StringIO()
     util.sendfile(f, sio)
     f.close()
     sio.seek(0)