X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=TLD_Builder%2Frequest_fetcher.py;h=9a1caa53bdba946f68f8c9605e79455459b780d8;hb=ec320254f705e073031b3e42b599901d8f30798d;hp=25b130f7007da73017100b542439a032181315d0;hpb=9ea122b00e3a99b16246e1e38576916a2e25c0aa;p=tld-builder.git

diff --git a/TLD_Builder/request_fetcher.py b/TLD_Builder/request_fetcher.py
index 25b130f..9a1caa5 100644
--- a/TLD_Builder/request_fetcher.py
+++ b/TLD_Builder/request_fetcher.py
@@ -4,9 +4,8 @@ import string
 import signal
 import os
 import urllib
-import urllib2
 import sys
-from io import StringIO
+from io import StringIO, BytesIO
 import gzip
 import path
 import log
@@ -42,8 +41,8 @@ def has_new(control_url):
     signal.alarm(300)
     try:
         headers = { 'Cache-Control': 'no-cache', 'Pragma': 'no-cache' }
-        req = urllib2.Request(url=control_url + "/max_req_no", headers=headers)
-        f = urllib2.urlopen(req)
+        req = urllib.request.Request(url=control_url + "/max_req_no", headers=headers)
+        f = urllib.request.urlopen(req)
         count = int(f.readline().strip())
         signal.alarm(0)
     except Exception as e:
@@ -62,14 +61,14 @@ def fetch_queue(control_url):
     signal.alarm(300)
     try:
         headers = { 'Cache-Control': 'no-cache', 'Pragma': 'no-cache' }
-        req = urllib2.Request(url=control_url + "/queue.gz", headers=headers)
-        f = urllib2.urlopen(req)
+        req = urllib.request.Request(url=control_url + "/queue.gz", headers=headers)
+        f = urllib.request.urlopen(req)
         signal.alarm(0)
     except Exception as e:
         signal.alarm(0)
         log.error("can't fetch %s: %s" % (control_url + "/queue.gz", e))
         sys.exit(1)
-    sio = StringIO()
+    sio = BytesIO()
     util.sendfile(f, sio)
     f.close()
     sio.seek(0)