Fix update() methods to work with python-3.0. (trunk r12647)

svn path=/main/branches/2.1.6/; revision=12918

diff --git a/pym/portage/cache/mappings.py b/pym/portage/cache/mappings.py
index 5fe836daad115c468b266ef2247c25fb98ae2bee..a632ce61d134f99c5747684e2e79d694e08d915e 100644 (file)
--- a/pym/portage/cache/mappings.py
+++ b/pym/portage/cache/mappings.py
@@ -115,7 +115,12 @@ class MutableMapping(Mapping):
                if other is None:
                        pass
                elif hasattr(other, 'iteritems'):
-                       for k, v in other.iteritems():
+                       # Use getattr to avoid interference from 2to3.
+                       for k, v in getattr(other, 'iteritems')():
+                               self[k] = v
+               elif hasattr(other, 'items'):
+                       # Use getattr to avoid interference from 2to3.
+                       for k, v in getattr(other, 'items')():
                                self[k] = v
                elif hasattr(other, 'keys'):
                        for k in other.keys():
@@ -358,14 +363,25 @@ def slot_dict_class(keys, prefix="_val_"):
                                        self[key] = default
                                return default
 
-                       def update(self, d):
-                               i = getattr(d, "iteritems", None)
-                               if i is None:
-                                       i = d
+                       def update(self, other=None, **kwargs):
+                               if other is None:
+                                       pass
+                               elif hasattr(other, 'iteritems'):
+                                       # Use getattr to avoid interference from 2to3.
+                                       for k, v in getattr(other, 'iteritems')():
+                                               self[k] = v
+                               elif hasattr(other, 'items'):
+                                       # Use getattr to avoid interference from 2to3.
+                                       for k, v in getattr(other, 'items')():
+                                               self[k] = v
+                               elif hasattr(other, 'keys'):
+                                       for k in other.keys():
+                                               self[k] = other[k]
                                else:
-                                       i = i()
-                               for k, v in i:
-                                       self[k] = v
+                                       for k, v in other:
+                                               self[k] = v
+                               if kwargs:
+                                       self.update(kwargs)
 
                        def __getitem__(self, k):
                                try: