diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bb/utils.py | 1 | ||||
| -rw-r--r-- | lib/toaster/orm/models.py | 16 |
2 files changed, 12 insertions, 5 deletions
diff --git a/lib/bb/utils.py b/lib/bb/utils.py index 138da44ef..8f75871c1 100644 --- a/lib/bb/utils.py +++ b/lib/bb/utils.py @@ -41,7 +41,6 @@ from subprocess import getstatusoutput from contextlib import contextmanager from ctypes import cdll - logger = logging.getLogger("BitBake.Util") python_extensions = [e for e, _, _ in imp.get_suffixes()] diff --git a/lib/toaster/orm/models.py b/lib/toaster/orm/models.py index 88967a23f..9183b0cd7 100644 --- a/lib/toaster/orm/models.py +++ b/lib/toaster/orm/models.py @@ -1147,18 +1147,26 @@ class LayerIndexLayerSource(LayerSource): assert self.apiurl is not None from django.db import transaction, connection - import urllib2, urlparse, json + import json import os + + try: + from urllib.request import urlopen, URLError + from urllib.parse import urlparse + except ImportError: + from urllib2 import urlopen, URLError + from urlparse import urlparse + proxy_settings = os.environ.get("http_proxy", None) oe_core_layer = 'openembedded-core' def _get_json_response(apiurl = self.apiurl): - _parsedurl = urlparse.urlparse(apiurl) + _parsedurl = urlparse(apiurl) path = _parsedurl.path try: - res = urllib2.urlopen(apiurl) - except urllib2.URLError as e: + res = urlopen(apiurl) + except URLError as e: raise Exception("Failed to read %s: %s" % (path, e.reason)) return json.loads(res.read()) |