X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=TLD_Builder%2Frequest_fetcher.py;h=ae237a21331380a697430d6e657d2e307f729099;hb=a68953c88fba6e657febf9cb06273f44288f759c;hp=fc9f49dac3c21a26719070d4af7d39dd9b97f604;hpb=3a6296fff210d498302ce0a2da6beed689466347;p=tld-builder.git

diff --git a/TLD_Builder/request_fetcher.py b/TLD_Builder/request_fetcher.py
index fc9f49d..ae237a2 100644
--- a/TLD_Builder/request_fetcher.py
+++ b/TLD_Builder/request_fetcher.py
@@ -4,19 +4,15 @@ import string
 import signal
 import os
 import urllib
-import urllib2
 import sys
-if sys.version_info[0] == 2:
-    import StringIO
-else:
-    from io import StringIO
+from io import StringIO, BytesIO
 import gzip
-
 import path
 import log
 import status
 import lock
 import util
+import shutil
 import gpg
 import request
 import loop
@@ -46,8 +42,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:
@@ -66,15 +62,15 @@ 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()
-    util.sendfile(f, sio)
+    sio = BytesIO()
+    shutil.copyfileobj(f, sio)
     f.close()
     sio.seek(0)
     f = gzip.GzipFile(fileobj = sio)