[oe-commits] [openembedded-core] 16/21: wic: use next builtin instead of .next method
git at git.openembedded.org
git at git.openembedded.org
Fri May 13 17:10:53 UTC 2016
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit a3d9a2c3e1b753da832888d42407ec49f3b26ab7
Author: Ed Bartosh <ed.bartosh at linux.intel.com>
AuthorDate: Wed May 4 16:06:27 2016 +0300
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]
Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
scripts/lib/wic/filemap.py | 2 +-
scripts/lib/wic/msger.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/lib/wic/filemap.py b/scripts/lib/wic/filemap.py
index 2778be5..f3240ba 100644
--- a/scripts/lib/wic/filemap.py
+++ b/scripts/lib/wic/filemap.py
@@ -482,7 +482,7 @@ class FilemapFiemap(_FilemapBase):
self._log.debug("FilemapFiemap: get_mapped_ranges(%d, %d(%d))"
% (start, count, start + count - 1))
iterator = self._do_get_mapped_ranges(start, count)
- first_prev, last_prev = iterator.next()
+ first_prev, last_prev = next(iterator)
for first, last in iterator:
if last_prev == first - 1:
diff --git a/scripts/lib/wic/msger.py b/scripts/lib/wic/msger.py
index 4d8e704..fb8336d 100644
--- a/scripts/lib/wic/msger.py
+++ b/scripts/lib/wic/msger.py
@@ -148,7 +148,7 @@ def _split_msg(head, msg):
return head, msg
def get_loglevel():
- return (k for k, v in LOG_LEVELS.items() if v == LOG_LEVEL).next()
+ return next((k for k, v in LOG_LEVELS.items() if v == LOG_LEVEL))
def set_loglevel(level):
global LOG_LEVEL
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list