Avoid unnecessary calls to keys() when iterating over dictionaries.

dict objects provide an __iter__ method for the iteration which gives you the
keys, so calling keys directly is unnecessary, and isn't really a best
practice.  The only time you really need to call the keys is if there's a
danger of the dict changing out from underneith you, either due to external
forces or due to modification of the iterable in the loop.  Iterations over
os.environ are apparently subject to such changes, so they must continue to
use keys().

As an aside, also switches a couple spots to using sorted() rather than
creating a temporary list with keys() and sorting that.

(Bitbake rev: 5b6ccb16c6e71e23dac6920cd2df994d67c2587b)

Signed-off-by: Chris Larson <clarson@mvista.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

1 files changed, 3 insertions, 6 deletions

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 5f9becccac..938bdeaaea 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -219,18 +219,15 @@ class BBCooker:
         latest_versions = {}
 
         # Sort by priority
-        for pn in pkg_pn.keys():
+        for pn in pkg_pn:
             (last_ver,last_file,pref_ver,pref_file) = bb.providers.findBestProvider(pn, self.configuration.data, self.status)
             preferred_versions[pn] = (pref_ver, pref_file)
             latest_versions[pn] = (last_ver, last_file)
 
-        pkg_list = pkg_pn.keys()
-        pkg_list.sort()
-
         bb.msg.plain("%-35s %25s %25s" % ("Package Name", "Latest Version", "Preferred Version"))
         bb.msg.plain("%-35s %25s %25s\n" % ("============", "==============", "================="))
 
-        for p in pkg_list:
+        for p in sorted(pkg_pn):
             pref = preferred_versions[p]
             latest = latest_versions[p]
 
@@ -487,7 +484,7 @@ class BBCooker:
             self.status.preferred[providee] = provider
 
         # Calculate priorities for each file
-        for p in self.status.pkg_fn.keys():
+        for p in self.status.pkg_fn:
             self.status.bbfile_priority[p] = calc_bbfile_priority(p)
 
     def buildWorldTargetList(self):