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/portage/getbinpkg.py | |
| 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/portage/getbinpkg.py')
| -rw-r--r-- | pym/portage/getbinpkg.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pym/portage/getbinpkg.py b/pym/portage/getbinpkg.py index da0dd77ad..cd1bd0dc1 100644 --- a/pym/portage/getbinpkg.py +++ b/pym/portage/getbinpkg.py @@ -15,9 +15,9 @@ import base64 import urllib2 try: - import cPickle + import cPickle as pickle except ImportError: - import pickle as cPickle + import pickle try: import ftplib @@ -473,11 +473,11 @@ def dir_get_metadata(baseurl, conn=None, chunk_size=3000, verbose=1, usingcache= out = sys.stdout try: metadatafile = open("/var/cache/edb/remote_metadata.pickle") - metadata = cPickle.load(metadatafile) + metadata = pickle.load(metadatafile) out.write("Loaded metadata pickle.\n") out.flush() metadatafile.close() - except (cPickle.UnpicklingError, OSError, IOError, EOFError): + except (pickle.UnpicklingError, OSError, IOError, EOFError): metadata = {} if baseurl not in metadata: metadata[baseurl]={} @@ -546,7 +546,7 @@ def dir_get_metadata(baseurl, conn=None, chunk_size=3000, verbose=1, usingcache= sys.stderr.flush() mytempfile.close() try: - metadata[baseurl]["data"] = cPickle.loads(data) + metadata[baseurl]["data"] = pickle.loads(data) del data metadata[baseurl]["indexname"] = mfile metadata[baseurl]["timestamp"] = int(time.time()) @@ -562,7 +562,7 @@ def dir_get_metadata(baseurl, conn=None, chunk_size=3000, verbose=1, usingcache= sys.stderr.flush() try: metadatafile = open("/var/cache/edb/remote_metadata.pickle", "w+") - cPickle.dump(metadata,metadatafile) + pickle.dump(metadata,metadatafile) metadatafile.close() except SystemExit, e: raise @@ -652,11 +652,11 @@ def dir_get_metadata(baseurl, conn=None, chunk_size=3000, verbose=1, usingcache= if "modified" in metadata[baseurl] and metadata[baseurl]["modified"]: metadata[baseurl]["timestamp"] = int(time.time()) metadatafile = open("/var/cache/edb/remote_metadata.pickle", "w+") - cPickle.dump(metadata,metadatafile) + pickle.dump(metadata,metadatafile) metadatafile.close() if makepickle: metadatafile = open(makepickle, "w") - cPickle.dump(metadata[baseurl]["data"],metadatafile) + pickle.dump(metadata[baseurl]["data"],metadatafile) metadatafile.close() except SystemExit, e: raise |