@@ -59,7 +59,6 @@
from __future__ import print_function
-import urllib2
import csv
from random import randint
import subprocess
@@ -73,6 +72,13 @@ import hashlib
import argparse
import ConfigParser
+if sys.hexversion >= 0x3000000:
+ import urllib.request as _urllib
+else:
+ import urllib2 as _urllib
+
+urlopen = _urllib.urlopen
+
MAX_DURATION = 60 * 60 * 4
VERSION = 1
@@ -81,7 +87,7 @@ def log_write(logf, msg):
logf.flush()
def check_version():
- r = urllib2.urlopen('http://autobuild.buildroot.org/version')
+ r = urlopen('http://autobuild.buildroot.org/version')
version = int(r.readline().strip())
if version > VERSION:
print("ERROR: script version too old, please upgrade.")
@@ -136,7 +142,7 @@ def get_toolchain_configs():
- contents: an array of lines of the defconfig
"""
- r = urllib2.urlopen('http://autobuild.buildroot.org/toolchains/configs/toolchain-configs.csv')
+ r = urlopen('http://autobuild.buildroot.org/toolchains/configs/toolchain-configs.csv')
l = r.readlines()
configs = []
for row in csv.reader(l):
@@ -151,7 +157,7 @@ def get_toolchain_configs():
if hostarch != config["hostarch"]:
continue
config["libc"] = row[2]
- r = urllib2.urlopen(config["url"])
+ r = urlopen(config["url"])
config["contents"] = r.readlines()
configs.append(config)
return configs
urllib2 has been split into several modules, urlopen() is now part of urllib.request. Py2k compatibility: import urllib2 if python version < 3 Signed-off-by: André Erdmann <dywi@mailerd.de> --- scripts/autobuild-run | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)