import string
import signal
import os
-import urllib
-import urllib2
+import urllib.request
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
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
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)
- count = int(string.strip(f.readline()))
+ 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:
signal.alarm(0)
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.StringIO()
- util.sendfile(f, sio)
+ sio = BytesIO()
+ shutil.copyfileobj(f, sio)
f.close()
sio.seek(0)
f = gzip.GzipFile(fileobj = sio)