Simplify LazyItemsDict.__deepcopy__().
authorZac Medico <zmedico@gentoo.org>
Sun, 31 Oct 2010 17:53:31 +0000 (10:53 -0700)
committerZac Medico <zmedico@gentoo.org>
Sun, 31 Oct 2010 17:53:31 +0000 (10:53 -0700)
pym/portage/util/__init__.py

index 51c35d38547993967da067a0e33ba692bb971a8f..b6f0ae2e32c3d042dc8d1abe89c586ce683b49a4 100644 (file)
@@ -1329,13 +1329,10 @@ class LazyItemsDict(UserDict):
                        if k in self.lazy_items:
                                lazy_item = self.lazy_items[k]
                                if not lazy_item.singleton:
-                                       raise TypeError("LazyItemsDict deepcopy is " + \
-                                               "unsafe with lazy items that " + \
-                                               "are not singletons: %s" % (lazy_item,))
-                               UserDict.__setitem__(result,
-                                       k_copy, deepcopy(self[k], memo))
-                       else:
-                               UserDict.__setitem__(result, k_copy, deepcopy(self[k], memo))
+                                       raise TypeError(_unicode_decode("LazyItemsDict " + \
+                                               "deepcopy is unsafe with lazy items that are " + \
+                                               "not singletons: key=%s value=%s") % (k, lazy_item,))
+                       UserDict.__setitem__(result, k_copy, deepcopy(self[k], memo))
                return result
 
        class _LazyItem(object):