Some functions and classes have been moved from urllib[2] to urllib.request and urllib.error in python 3.
Used new imports to make the code working in python 3. Signed-off-by: Ed Bartosh <[email protected]> --- scripts/contrib/verify-homepage.py | 4 ++-- scripts/send-error-report | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/contrib/verify-homepage.py b/scripts/contrib/verify-homepage.py index 265ff65..18bb15b 100755 --- a/scripts/contrib/verify-homepage.py +++ b/scripts/contrib/verify-homepage.py @@ -7,7 +7,7 @@ import sys import os import subprocess -import urllib2 +import urllib.request # Allow importing scripts/lib modules @@ -47,7 +47,7 @@ def verifyHomepage(bbhandler): homepage = data.getVar("HOMEPAGE", True) if homepage: try: - urllib2.urlopen(homepage, timeout=5) + urllib.request.urlopen(homepage, timeout=5) except Exception: count = count + wgetHomepage(os.path.basename(realfn), homepage) checked.append(realfn) diff --git a/scripts/send-error-report b/scripts/send-error-report index 7251e27..122ce32 100755 --- a/scripts/send-error-report +++ b/scripts/send-error-report @@ -7,7 +7,7 @@ # Author: Andreea Proca <[email protected]> # Author: Michael Wood <[email protected]> -import urllib2 +import urllib.request, urllib.error import sys import json import os @@ -25,10 +25,10 @@ log = logging.getLogger("send-error-report") logging.basicConfig(format='%(levelname)s: %(message)s') def getPayloadLimit(url): - req = urllib2.Request(url, None) + req = urllib.request.Request(url, None) try: - response = urllib2.urlopen(req) - except urllib2.URLError as e: + response = urllib.request.urlopen(req) + except urllib.error.URLError as e: # Use this opportunity to bail out if we can't even contact the server log.error("Could not contact server: " + url) log.error(e.reason) @@ -136,10 +136,10 @@ def send_data(data, args): else: url = "http://"+args.server+"/ClientPost/"; - req = urllib2.Request(url, data=data, headers=headers) + req = urllib.request.Request(url, data=data, headers=headers) try: - response = urllib2.urlopen(req) - except urllib2.HTTPError, e: + response = urllib.request.urlopen(req) + except urllib.error.HTTPError as e: logging.error(e.reason) sys.exit(1) -- 2.1.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
