diff options
author | Marcin Krol | 2021-05-02 11:51:26 (GMT) |
---|---|---|
committer | Marcin Krol | 2021-05-02 11:51:26 (GMT) |
commit | 8880fdd5b98fe093a0ef977a5067d84789d039c9 (patch) | |
tree | b2a136b1927cfe8d9c63649bf03aeb8aa9acac1f | |
parent | ccee54c2efc59acafcca2d77ce2499d7df202250 (diff) | |
download | pld-builder.new-8880fdd5b98fe093a0ef977a5067d84789d039c9.zip pld-builder.new-8880fdd5b98fe093a0ef977a5067d84789d039c9.tar.gz |
- ported python parts to python3
-rwxr-xr-x | client/make-request.sh | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/client/make-request.sh b/client/make-request.sh index 605d949..e27992a 100755 --- a/client/make-request.sh +++ b/client/make-request.sh @@ -101,20 +101,21 @@ send_request() { ;; *) msg "Sending using HTTP mode to $url" - cat - | python -c ' -import sys, socket, urllib2 + cat - | python3 -c ' +import sys, socket +from urllib import request try: - data = sys.stdin.read() + data = sys.stdin.read().encode("utf-8") url = sys.argv[1] socket.setdefaulttimeout(30) - req = urllib2.Request(url, data) - f = urllib2.urlopen(req) + req = request.Request(url, data=data) + f = request.urlopen(req) f.close() except Exception as e: - print >> sys.stderr, "Problem while sending request via HTTP: %s: %s" % (url, e) + print("Problem while sending request via HTTP: %s: %s" % (url, e), file=sys.stderr) sys.exit(1) -print >> sys.stdout, "Request queued via HTTP." +print("Request queued via HTTP.", file=sys.stdout) ' "$url" ;; esac @@ -605,36 +606,36 @@ esac # need to do this after dist selection if [ "$skip" ]; then - skip=$(skip="$skip" control_url="$control_url" python -c ' -import urllib2 + skip=$(skip="$skip" control_url="$control_url" python3 -c ' import sys -import StringIO import gzip import re import os import string +from urllib import request +from io import BytesIO from xml.dom import minidom skip = os.environ.get("skip").split(","); control_url = os.environ.get("control_url") -print >> sys.stderr, "* Check queue_id-s against %s" % control_url +print("* Check queue_id-s against %s" % control_url, file=sys.stderr) try: headers = { "Cache-Control": "no-cache", "Pragma": "no-cache" } - req = urllib2.Request(url=control_url + "/queue.gz", headers=headers) - f = urllib2.urlopen(req) + req = request.Request(url=control_url + "/queue.gz", headers=headers) + f = request.urlopen(req) except Exception, e: - print >> sys.stderr, "Fetch error %s: %s" % (control_url + "/queue.gz", e) + print("Fetch error %s: %s" % (control_url + "/queue.gz", e), file=sys.stderr) sys.exit(1) -sio = StringIO.StringIO() +sio = BytesIO() sio.write(f.read()) f.close() sio.seek(0) f = gzip.GzipFile(fileobj = sio) -xml = re.compile("(<queue>.*?</queue>)", re.DOTALL).match(f.read()).group(1) +xml = re.compile("(<queue>.*?</queue>)", re.DOTALL).match(f.read().decode("utf-8")).group(1) d = minidom.parseString(xml) q = [] @@ -646,13 +647,13 @@ for c in d.documentElement.childNodes: err = 0 for s in skip: if s not in q: - print >> sys.stderr, "- Check %s: ERROR: Not valid queue-id" % s + print("- Check %s: ERROR: Not valid queue-id" % s, file=sys.stderr) err = 1 else: - print >> sys.stderr, "- Check %s: OK" % s + print("- Check %s: OK" % s, file=sys.stderr) if err == 1: sys.exit(1) -print string.join(skip, ",") +print(",".join(skip)) ') || exit $? f_upgrade=no build_mode=test |