mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-10 00:43:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

Much more pickling now works.

Browse source
This commit is contained in:
Guido van Rossum 2007-05-04 20:30:19 +00:00
parent 2e6a4b37ba
commit 1255ed62bf
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/pickle.py
View file

@ -308,7 +308,7 @@ class Pickler:
(t.__name__, obj)) (t.__name__, obj))
# Check for string returned by reduce(), meaning "save as global" # Check for string returned by reduce(), meaning "save as global"
if inistance(rv, basestring): if isinstance(rv, basestring):
self.save_global(obj, rv) self.save_global(obj, rv)
return return
@ -512,7 +512,8 @@ class Pickler:
else: else:
obj = obj.replace("\\", "\\u005c") obj = obj.replace("\\", "\\u005c")
obj = obj.replace("\n", "\\u000a") obj = obj.replace("\n", "\\u000a")
self.write(UNICODE + obj.encode('raw-unicode-escape') + 'b\n') self.write(UNICODE + bytes(obj.encode('raw-unicode-escape')) +
b'\n')
self.memoize(obj) self.memoize(obj)
dispatch[str] = save_unicode dispatch[str] = save_unicode
@ -895,7 +896,7 @@ class Unpickler:
dispatch[BININT2[0]] = load_binint2 dispatch[BININT2[0]] = load_binint2
def load_long(self): def load_long(self):
self.append(int(self.readline()[:-1], 0)) self.append(int(str(self.readline()[:-1]), 0))
dispatch[LONG[0]] = load_long dispatch[LONG[0]] = load_long
def load_long1(self): def load_long1(self):
@ -1081,6 +1082,8 @@ class Unpickler:
def find_class(self, module, name): def find_class(self, module, name):
# Subclasses may override this # Subclasses may override this
module = str(module)
name = str(name)
__import__(module) __import__(module)
mod = sys.modules[module] mod = sys.modules[module]
klass = getattr(mod, name) klass = getattr(mod, name)
@ -1122,7 +1125,7 @@ class Unpickler:
dispatch[LONG_BINGET[0]] = load_long_binget dispatch[LONG_BINGET[0]] = load_long_binget
def load_put(self): def load_put(self):
self.memo[self.readline()[:-1]] = self.stack[-1] self.memo[str(self.readline()[:-1])] = self.stack[-1]
dispatch[PUT[0]] = load_put dispatch[PUT[0]] = load_put
def load_binput(self): def load_binput(self):