From 4d5c56cc0177c6d65814522ffc16f3b401b4199b Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 31 Oct 2010 10:53:31 -0700 Subject: Simplify LazyItemsDict.__deepcopy__(). --- pym/portage/util/__init__.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'pym/portage/util/__init__.py') diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py index 51c35d385..b6f0ae2e3 100644 --- a/pym/portage/util/__init__.py +++ b/pym/portage/util/__init__.py @@ -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): -- cgit v1.2.3-1-g7c22