1 |
Author: zmedico |
2 |
Date: 2008-09-23 20:04:09 +0000 (Tue, 23 Sep 2008) |
3 |
New Revision: 11536 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/_emerge/__init__.py |
7 |
main/trunk/pym/portage/__init__.py |
8 |
main/trunk/pym/portage/dbapi/vartree.py |
9 |
main/trunk/pym/portage/getbinpkg.py |
10 |
main/trunk/pym/portage/util.py |
11 |
Log: |
12 |
Import cPickle as pickle instead of vice versa. Eases 2to3's job because |
13 |
cPickle won't exist in py3k and 2to3 does s/cPickle/pickle. Thanks to |
14 |
Ali Polatel <hawking@g.o> for this patch. |
15 |
|
16 |
|
17 |
Modified: main/trunk/pym/_emerge/__init__.py |
18 |
=================================================================== |
19 |
--- main/trunk/pym/_emerge/__init__.py 2008-09-22 20:28:15 UTC (rev 11535) |
20 |
+++ main/trunk/pym/_emerge/__init__.py 2008-09-23 20:04:09 UTC (rev 11536) |
21 |
@@ -73,9 +73,9 @@ |
22 |
from UserDict import DictMixin |
23 |
|
24 |
try: |
25 |
- import cPickle |
26 |
+ import cPickle as pickle |
27 |
except ImportError: |
28 |
- import pickle as cPickle |
29 |
+ import pickle |
30 |
|
31 |
try: |
32 |
import cStringIO as StringIO |
33 |
@@ -3659,13 +3659,13 @@ |
34 |
def _load(self): |
35 |
try: |
36 |
f = open(self._cache_filename) |
37 |
- mypickle = cPickle.Unpickler(f) |
38 |
+ mypickle = pickle.Unpickler(f) |
39 |
mypickle.find_global = None |
40 |
self._cache_data = mypickle.load() |
41 |
f.close() |
42 |
del f |
43 |
- except (IOError, OSError, EOFError, cPickle.UnpicklingError), e: |
44 |
- if isinstance(e, cPickle.UnpicklingError): |
45 |
+ except (IOError, OSError, EOFError, pickle.UnpicklingError), e: |
46 |
+ if isinstance(e, pickle.UnpicklingError): |
47 |
writemsg("!!! Error loading '%s': %s\n" % \ |
48 |
(self._cache_filename, str(e)), noiselevel=-1) |
49 |
del e |
50 |
@@ -3745,7 +3745,7 @@ |
51 |
secpass >= 2: |
52 |
try: |
53 |
f = portage.util.atomic_ofstream(self._cache_filename) |
54 |
- cPickle.dump(self._cache_data, f, -1) |
55 |
+ pickle.dump(self._cache_data, f, -1) |
56 |
f.close() |
57 |
portage.util.apply_secpass_permissions( |
58 |
self._cache_filename, gid=portage.portage_gid, mode=0644) |
59 |
|
60 |
Modified: main/trunk/pym/portage/__init__.py |
61 |
=================================================================== |
62 |
--- main/trunk/pym/portage/__init__.py 2008-09-22 20:28:15 UTC (rev 11535) |
63 |
+++ main/trunk/pym/portage/__init__.py 2008-09-23 20:04:09 UTC (rev 11536) |
64 |
@@ -20,9 +20,9 @@ |
65 |
import shutil |
66 |
import time |
67 |
try: |
68 |
- import cPickle |
69 |
+ import cPickle as pickle |
70 |
except ImportError: |
71 |
- import pickle as cPickle |
72 |
+ import pickle |
73 |
|
74 |
import stat |
75 |
import commands |
76 |
@@ -7025,7 +7025,7 @@ |
77 |
d.update(mydict) |
78 |
try: |
79 |
f = atomic_ofstream(filename) |
80 |
- cPickle.dump(d, f, -1) |
81 |
+ pickle.dump(d, f, -1) |
82 |
f.close() |
83 |
portage.util.apply_secpass_permissions(filename, uid=uid, gid=portage_gid, mode=0664) |
84 |
except (IOError, OSError), e: |
85 |
@@ -7179,13 +7179,13 @@ |
86 |
def _load(self, filename): |
87 |
try: |
88 |
f = open(filename) |
89 |
- mypickle = cPickle.Unpickler(f) |
90 |
+ mypickle = pickle.Unpickler(f) |
91 |
mypickle.find_global = None |
92 |
d = mypickle.load() |
93 |
f.close() |
94 |
del f |
95 |
- except (IOError, OSError, EOFError, cPickle.UnpicklingError), e: |
96 |
- if isinstance(e, cPickle.UnpicklingError): |
97 |
+ except (IOError, OSError, EOFError, pickle.UnpicklingError), e: |
98 |
+ if isinstance(e, pickle.UnpicklingError): |
99 |
writemsg("!!! Error loading '%s': %s\n" % \ |
100 |
(filename, str(e)), noiselevel=-1) |
101 |
del e |
102 |
|
103 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
104 |
=================================================================== |
105 |
--- main/trunk/pym/portage/dbapi/vartree.py 2008-09-22 20:28:15 UTC (rev 11535) |
106 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-09-23 20:04:09 UTC (rev 11536) |
107 |
@@ -37,9 +37,9 @@ |
108 |
from itertools import izip |
109 |
|
110 |
try: |
111 |
- import cPickle |
112 |
+ import cPickle as pickle |
113 |
except ImportError: |
114 |
- import pickle as cPickle |
115 |
+ import pickle |
116 |
|
117 |
class PreservedLibsRegistry(object): |
118 |
""" This class handles the tracking of preserved library objects """ |
119 |
@@ -57,7 +57,7 @@ |
120 |
def load(self): |
121 |
""" Reload the registry data from file """ |
122 |
try: |
123 |
- self._data = cPickle.load(open(self._filename, "r")) |
124 |
+ self._data = pickle.load(open(self._filename, "r")) |
125 |
except (EOFError, IOError), e: |
126 |
if isinstance(e, EOFError) or e.errno == errno.ENOENT: |
127 |
self._data = {} |
128 |
@@ -74,7 +74,7 @@ |
129 |
return |
130 |
try: |
131 |
f = atomic_ofstream(self._filename) |
132 |
- cPickle.dump(self._data, f) |
133 |
+ pickle.dump(self._data, f) |
134 |
f.close() |
135 |
except EnvironmentError, e: |
136 |
if e.errno != PermissionDenied.errno: |
137 |
@@ -956,7 +956,7 @@ |
138 |
del self._aux_cache["modified"] |
139 |
try: |
140 |
f = atomic_ofstream(self._aux_cache_filename) |
141 |
- cPickle.dump(self._aux_cache, f, -1) |
142 |
+ pickle.dump(self._aux_cache, f, -1) |
143 |
f.close() |
144 |
apply_secpass_permissions( |
145 |
self._aux_cache_filename, gid=portage_gid, mode=0644) |
146 |
@@ -974,13 +974,13 @@ |
147 |
aux_cache = None |
148 |
try: |
149 |
f = open(self._aux_cache_filename) |
150 |
- mypickle = cPickle.Unpickler(f) |
151 |
+ mypickle = pickle.Unpickler(f) |
152 |
mypickle.find_global = None |
153 |
aux_cache = mypickle.load() |
154 |
f.close() |
155 |
del f |
156 |
- except (IOError, OSError, EOFError, cPickle.UnpicklingError), e: |
157 |
- if isinstance(e, cPickle.UnpicklingError): |
158 |
+ except (IOError, OSError, EOFError, pickle.UnpicklingError), e: |
159 |
+ if isinstance(e, pickle.UnpicklingError): |
160 |
writemsg("!!! Error loading '%s': %s\n" % \ |
161 |
(self._aux_cache_filename, str(e)), noiselevel=-1) |
162 |
del e |
163 |
|
164 |
Modified: main/trunk/pym/portage/getbinpkg.py |
165 |
=================================================================== |
166 |
--- main/trunk/pym/portage/getbinpkg.py 2008-09-22 20:28:15 UTC (rev 11535) |
167 |
+++ main/trunk/pym/portage/getbinpkg.py 2008-09-23 20:04:09 UTC (rev 11536) |
168 |
@@ -15,9 +15,9 @@ |
169 |
import urllib2 |
170 |
|
171 |
try: |
172 |
- import cPickle |
173 |
+ import cPickle as pickle |
174 |
except ImportError: |
175 |
- import pickle as cPickle |
176 |
+ import pickle |
177 |
|
178 |
try: |
179 |
import ftplib |
180 |
@@ -473,11 +473,11 @@ |
181 |
out = sys.stdout |
182 |
try: |
183 |
metadatafile = open("/var/cache/edb/remote_metadata.pickle") |
184 |
- metadata = cPickle.load(metadatafile) |
185 |
+ metadata = pickle.load(metadatafile) |
186 |
out.write("Loaded metadata pickle.\n") |
187 |
out.flush() |
188 |
metadatafile.close() |
189 |
- except (cPickle.UnpicklingError, OSError, IOError, EOFError): |
190 |
+ except (pickle.UnpicklingError, OSError, IOError, EOFError): |
191 |
metadata = {} |
192 |
if baseurl not in metadata: |
193 |
metadata[baseurl]={} |
194 |
@@ -546,7 +546,7 @@ |
195 |
sys.stderr.flush() |
196 |
mytempfile.close() |
197 |
try: |
198 |
- metadata[baseurl]["data"] = cPickle.loads(data) |
199 |
+ metadata[baseurl]["data"] = pickle.loads(data) |
200 |
del data |
201 |
metadata[baseurl]["indexname"] = mfile |
202 |
metadata[baseurl]["timestamp"] = int(time.time()) |
203 |
@@ -562,7 +562,7 @@ |
204 |
sys.stderr.flush() |
205 |
try: |
206 |
metadatafile = open("/var/cache/edb/remote_metadata.pickle", "w+") |
207 |
- cPickle.dump(metadata,metadatafile) |
208 |
+ pickle.dump(metadata,metadatafile) |
209 |
metadatafile.close() |
210 |
except SystemExit, e: |
211 |
raise |
212 |
@@ -652,11 +652,11 @@ |
213 |
if "modified" in metadata[baseurl] and metadata[baseurl]["modified"]: |
214 |
metadata[baseurl]["timestamp"] = int(time.time()) |
215 |
metadatafile = open("/var/cache/edb/remote_metadata.pickle", "w+") |
216 |
- cPickle.dump(metadata,metadatafile) |
217 |
+ pickle.dump(metadata,metadatafile) |
218 |
metadatafile.close() |
219 |
if makepickle: |
220 |
metadatafile = open(makepickle, "w") |
221 |
- cPickle.dump(metadata[baseurl]["data"],metadatafile) |
222 |
+ pickle.dump(metadata[baseurl]["data"],metadatafile) |
223 |
metadatafile.close() |
224 |
except SystemExit, e: |
225 |
raise |
226 |
|
227 |
Modified: main/trunk/pym/portage/util.py |
228 |
=================================================================== |
229 |
--- main/trunk/pym/portage/util.py 2008-09-22 20:28:15 UTC (rev 11535) |
230 |
+++ main/trunk/pym/portage/util.py 2008-09-23 20:04:09 UTC (rev 11536) |
231 |
@@ -17,9 +17,9 @@ |
232 |
from portage.dep import isvalidatom |
233 |
|
234 |
try: |
235 |
- import cPickle |
236 |
+ import cPickle as pickle |
237 |
except ImportError: |
238 |
- import pickle as cPickle |
239 |
+ import pickle |
240 |
|
241 |
try: |
242 |
import cStringIO as StringIO |
243 |
@@ -568,7 +568,7 @@ |
244 |
import os |
245 |
try: |
246 |
myf=open(filename,"w") |
247 |
- cPickle.dump(data,myf,-1) |
248 |
+ pickle.dump(data,myf,-1) |
249 |
myf.flush() |
250 |
myf.close() |
251 |
writemsg("Wrote pickle: "+str(filename)+"\n",1) |
252 |
@@ -588,7 +588,7 @@ |
253 |
data = None |
254 |
try: |
255 |
myf = open(filename) |
256 |
- mypickle = cPickle.Unpickler(myf) |
257 |
+ mypickle = pickle.Unpickler(myf) |
258 |
mypickle.find_global = None |
259 |
data = mypickle.load() |
260 |
myf.close() |