Clean up stack_dicts() a little.
authorZac Medico <zmedico@gentoo.org>
Tue, 22 Sep 2009 21:58:38 +0000 (21:58 -0000)
committerZac Medico <zmedico@gentoo.org>
Tue, 22 Sep 2009 21:58:38 +0000 (21:58 -0000)
svn path=/main/trunk/; revision=14387

pym/portage/util.py

index de5254aed54773827c8a4dcd2acfa5c9c7491d33..d89f723c893d2697f80399c92a7cf00499fb09ca 100644 (file)
@@ -222,12 +222,11 @@ def stack_dicts(dicts, incremental=0, incrementals=[], ignore_none=0):
                        continue
                if final_dict is None:
                        final_dict = {}
-               for y in mydict:
-                       if True:
-                               if y in final_dict and (incremental or (y in incrementals)):
-                                       final_dict[y] += " "+mydict[y][:]
-                               else:
-                                       final_dict[y]  = mydict[y][:]
+               for k, v in mydict.items():
+                       if k in final_dict and (incremental or (k in incrementals)):
+                               final_dict[k] += " " + v
+                       else:
+                               final_dict[k]  = v
        return final_dict
 
 def stack_lists(lists, incremental=1):