diff options
author | Zac Medico <zmedico@gentoo.org> | 2009-03-05 03:03:50 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2009-03-05 03:03:50 +0000 |
commit | 29950d3be0b14877587dec725eeabbb949e0d616 (patch) | |
tree | d838a6f5787600da5f9d64437caacd4b2e16d5e9 /pym/_emerge | |
parent | 7270ee7ebb0dccc83a073a04e73d66346d6e698d (diff) | |
download | portage-29950d3be0b14877587dec725eeabbb949e0d616.tar.gz portage-29950d3be0b14877587dec725eeabbb949e0d616.tar.bz2 portage-29950d3be0b14877587dec725eeabbb949e0d616.zip |
Set Unpickler.find_global = None when possible and handle AttributeError
for py3k.
svn path=/main/trunk/; revision=12751
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 8abe080f9..a53d58a8f 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -4105,6 +4105,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 |