X-Git-Url: https://git.tld-linux.org/?p=tld-builder.git;a=blobdiff_plain;f=TLD_Builder%2Frequest_fetcher.py;h=609ec711bcf644425bc247a671e6df4a45e44339;hp=6122612142a2b31bac411ee22b14e68da0e2d57c;hb=98531ab4a0e4e065d3b11b051b3e4bd7653c6ac0;hpb=e6b6d095d23af595e207bb278697e1b9423fbc53 diff --git a/TLD_Builder/request_fetcher.py b/TLD_Builder/request_fetcher.py index 6122612..609ec71 100644 --- 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)