diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-11 06:38:13 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 06:38:13 +0000 |
| commit | cd2e8987d498d77758ae59d5a7a4deb5ae36b961 (patch) | |
| tree | ea4cabfc0cf6c42635ca6a7a252993b753aa4a3a /pym/_emerge | |
| parent | e2e1316a18be8f06ec1583cc6b7508acab641aee (diff) | |
| download | portage-cd2e8987d498d77758ae59d5a7a4deb5ae36b961.tar.gz portage-cd2e8987d498d77758ae59d5a7a4deb5ae36b961.tar.bz2 portage-cd2e8987d498d77758ae59d5a7a4deb5ae36b961.zip | |
Set Unpickler.find_global = None when possible and handle AttributeError
for py3k. (trunk r12751)
svn path=/main/branches/2.1.6/; revision=12999
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/__init__.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 23a051d5b..6431edc26 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -4089,6 +4089,11 @@ class BlockerCache(portage.cache.mappings.MutableMapping): try: f = open(self._cache_filename, mode='rb') mypickle = pickle.Unpickler(f) + try: + mypickle.find_global = None + except AttributeError: + # TODO: If py3k, override Unpickler.find_class(). + pass self._cache_data = mypickle.load() f.close() del f |