diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-05-10 14:35:55 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-02 08:24:03 +0100 |
| commit | 0224f7599995166e15d1ea2d1b0e6155f5026a18 (patch) | |
| tree | bc7ca4c37680a63a2faee8679cdc4de0fcba4fc5 /bitbake/lib/bb/utils.py | |
| parent | bbc6e754e84115099722c78259868ee0e64bdc3c (diff) | |
| download | poky-0224f7599995166e15d1ea2d1b0e6155f5026a18.tar.gz | |
bitbake: toaster: fix imports to work for python 3
Some APIs have been moved to other modules in python 3:
getstatusoutput: moved from commands to subproces
urlopen: moved from urllib2 to urllib.request
urlparse: moved from urlparse to urllib.parse
Made the imports work for both python versions by
catching ImportError and importing APIs from different
modules.
[YOCTO #9584]
(Bitbake rev: 1abaa1c6a950b327e6468192dd910549643768bb)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/utils.py')
| -rw-r--r-- | bitbake/lib/bb/utils.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index 138da44ef1..8f75871c18 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py | |||
| @@ -41,7 +41,6 @@ from subprocess import getstatusoutput | |||
| 41 | from contextlib import contextmanager | 41 | from contextlib import contextmanager |
| 42 | from ctypes import cdll | 42 | from ctypes import cdll |
| 43 | 43 | ||
| 44 | |||
| 45 | logger = logging.getLogger("BitBake.Util") | 44 | logger = logging.getLogger("BitBake.Util") |
| 46 | python_extensions = [e for e, _, _ in imp.get_suffixes()] | 45 | python_extensions = [e for e, _, _ in imp.get_suffixes()] |
| 47 | 46 | ||