- use subprocess.Popen instead of os.popen which is now text only

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

diff --git a/TLD_Builder/request_fetcher.py b/TLD_Builder/request_fetcher.py
index 226e4ee573c3f4054c8f296700dace689e655b52..ae237a21331380a697430d6e657d2e307f729099 100644 (file)
--- a/TLD_Builder/request_fetcher.py
+++ b/TLD_Builder/request_fetcher.py
@@ -5,13 +5,14 @@ import signal
 import os
 import urllib
 import sys
-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
@@ -68,8 +69,8 @@ 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()
-    util.sendfile(f, sio)
+    sio = BytesIO()
+    shutil.copyfileobj(f, sio)
     f.close()
     sio.seek(0)
     f = gzip.GzipFile(fileobj = sio)