summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-05-04 16:06:27 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-14 23:05:14 +0100
commitc589aff0804ea14f06ac93e1adcfbbae65ee9b3b (patch)
treea992d530d21c134b21d3da2c1e4bb03518bc4ca5 /scripts/lib/wic
parentdd732eeedd646363007bde0764d73d419613d9f6 (diff)
downloadpoky-c589aff0804ea14f06ac93e1adcfbbae65ee9b3b.tar.gz
wic: use next builtin instead of .next method
Generators in Python 3 don't have .next method. It's recommended to use 'next' builtin instead. As it also present in Python >= 2.6 it should make wic code compatible with both Python 2 and Python 3. [YOCTO #9412] (From OE-Core rev: 9b7ab632e47d786dd979262015dbfb1254103f83) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic')
-rw-r--r--scripts/lib/wic/filemap.py2
-rw-r--r--scripts/lib/wic/msger.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/wic/filemap.py b/scripts/lib/wic/filemap.py
index 2778be5e1b..f3240ba8d8 100644
--- a/scripts/lib/wic/filemap.py
+++ b/scripts/lib/wic/filemap.py
@@ -482,7 +482,7 @@ class FilemapFiemap(_FilemapBase):
482 self._log.debug("FilemapFiemap: get_mapped_ranges(%d, %d(%d))" 482 self._log.debug("FilemapFiemap: get_mapped_ranges(%d, %d(%d))"
483 % (start, count, start + count - 1)) 483 % (start, count, start + count - 1))
484 iterator = self._do_get_mapped_ranges(start, count) 484 iterator = self._do_get_mapped_ranges(start, count)
485 first_prev, last_prev = iterator.next() 485 first_prev, last_prev = next(iterator)
486 486
487 for first, last in iterator: 487 for first, last in iterator:
488 if last_prev == first - 1: 488 if last_prev == first - 1:
diff --git a/scripts/lib/wic/msger.py b/scripts/lib/wic/msger.py
index 4d8e704172..fb8336d94a 100644
--- a/scripts/lib/wic/msger.py
+++ b/scripts/lib/wic/msger.py
@@ -148,7 +148,7 @@ def _split_msg(head, msg):
148 return head, msg 148 return head, msg
149 149
150def get_loglevel(): 150def get_loglevel():
151 return (k for k, v in LOG_LEVELS.items() if v == LOG_LEVEL).next() 151 return next((k for k, v in LOG_LEVELS.items() if v == LOG_LEVEL))
152 152
153def set_loglevel(level): 153def set_loglevel(level):
154 global LOG_LEVEL 154 global LOG_LEVEL