diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-10-29 16:29:37 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-10-29 16:29:37 -0700 |
| commit | b97f47c481288f6c399af41cc33e0ad349842e8b (patch) | |
| tree | c6cd0231492fb02f439c8eb03e7d11ee9514093e /pym/portage/util/__init__.py | |
| parent | 142f30000454ac002334ebbecc3ad4010b64e796 (diff) | |
| download | portage-b97f47c481288f6c399af41cc33e0ad349842e8b.tar.gz portage-b97f47c481288f6c399af41cc33e0ad349842e8b.tar.bz2 portage-b97f47c481288f6c399af41cc33e0ad349842e8b.zip | |
Fix LazyItemsDict.__deepcopy__() for python 2.7.
In python-2.7, changes in deepcopy() make LazyItemsDict.__deepcopy__()
fail in some cases. Thanks to Diego E. Pettenò <flameeyes@g.o> for
reporting.
Diffstat (limited to 'pym/portage/util/__init__.py')
| -rw-r--r-- | pym/portage/util/__init__.py | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py index 0c2dc3382..a0f578eb4 100644 --- a/pym/portage/util/__init__.py +++ b/pym/portage/util/__init__.py @@ -1341,15 +1341,12 @@ class LazyItemsDict(UserDict): k_copy = deepcopy(k, memo) if k in self.lazy_items: lazy_item = self.lazy_items[k] - try: - result.lazy_items[k_copy] = deepcopy(lazy_item, memo) - except TypeError: - if not lazy_item.singleton: - raise - UserDict.__setitem__(result, - k_copy, deepcopy(self[k], memo)) - else: - UserDict.__setitem__(result, k_copy, None) + 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)) return result |