diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-09-23 20:04:09 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-09-23 20:04:09 +0000 |
| commit | a997a5d7b3a2c48da4468dbf577497b5c39592c5 (patch) | |
| tree | 0a1fbfee2d77099a80d463dcea08ad8dbf050e9b /pym/_emerge | |
| parent | 23a3278f3f0b861a81836a819fd9f55cbb37ed1e (diff) | |
| download | portage-a997a5d7b3a2c48da4468dbf577497b5c39592c5.tar.gz portage-a997a5d7b3a2c48da4468dbf577497b5c39592c5.tar.bz2 portage-a997a5d7b3a2c48da4468dbf577497b5c39592c5.zip | |
Import cPickle as pickle instead of vice versa. Eases 2to3's job because
cPickle won't exist in py3k and 2to3 does s/cPickle/pickle. Thanks to
Ali Polatel <hawking@g.o> for this patch.
svn path=/main/trunk/; revision=11536
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/__init__.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 6b1ac46d2..8122b0839 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -73,9 +73,9 @@ from itertools import chain, izip from UserDict import DictMixin try: - import cPickle + import cPickle as pickle except ImportError: - import pickle as cPickle + import pickle try: import cStringIO as StringIO @@ -3659,13 +3659,13 @@ class BlockerCache(DictMixin): def _load(self): try: f = open(self._cache_filename) - mypickle = cPickle.Unpickler(f) + mypickle = pickle.Unpickler(f) mypickle.find_global = None self._cache_data = mypickle.load() f.close() del f - except (IOError, OSError, EOFError, cPickle.UnpicklingError), e: - if isinstance(e, cPickle.UnpicklingError): + except (IOError, OSError, EOFError, pickle.UnpicklingError), e: + if isinstance(e, pickle.UnpicklingError): writemsg("!!! Error loading '%s': %s\n" % \ (self._cache_filename, str(e)), noiselevel=-1) del e @@ -3745,7 +3745,7 @@ class BlockerCache(DictMixin): secpass >= 2: try: f = portage.util.atomic_ofstream(self._cache_filename) - cPickle.dump(self._cache_data, f, -1) + pickle.dump(self._cache_data, f, -1) f.close() portage.util.apply_secpass_permissions( self._cache_filename, gid=portage.portage_gid, mode=0644) |