traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get rid of string module and string exceptions.

This commit is contained in:
Guido van Rossum 2000-12-13 18:11:56 +00:00
parent bc9c1b15cc
commit ff87174db1
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Lib/pickle.py
View File

@ -27,7 +27,6 @@ __version__ = "$Revision$" # Code version
from types import * from types import *
from copy_reg import dispatch_table, safe_constructors from copy_reg import dispatch_table, safe_constructors
import string
import marshal import marshal
import sys import sys
import struct import struct
@ -42,6 +41,10 @@ class PickleError(Exception): pass
class PicklingError(PickleError): pass class PicklingError(PickleError): pass
class UnpicklingError(PickleError): pass class UnpicklingError(PickleError): pass
class _Stop(Exception):
def __init__(self, value):
self.value = value
try: try:
from org.python.core import PyStringMap from org.python.core import PyStringMap
except ImportError: except ImportError:
@ -514,8 +517,8 @@ class Unpickler:
while 1: while 1:
key = read(1) key = read(1)
dispatch[key](self) dispatch[key](self)
except STOP, value: except _Stop, stopinst:
return value return stopinst.value
def marker(self): def marker(self):
stack = self.stack stack = self.stack
@ -549,7 +552,7 @@ class Unpickler:
dispatch[NONE] = load_none dispatch[NONE] = load_none
def load_int(self): def load_int(self):
self.append(string.atoi(self.readline()[:-1])) self.append(int(self.readline()[:-1]))
dispatch[INT] = load_int dispatch[INT] = load_int
def load_binint(self): def load_binint(self):
@ -565,11 +568,11 @@ class Unpickler:
dispatch[BININT2] = load_binint2 dispatch[BININT2] = load_binint2
def load_long(self): def load_long(self):
self.append(string.atol(self.readline()[:-1], 0)) self.append(long(self.readline()[:-1], 0))
dispatch[LONG] = load_long dispatch[LONG] = load_long
def load_float(self): def load_float(self):
self.append(string.atof(self.readline()[:-1])) self.append(float(self.readline()[:-1]))
dispatch[FLOAT] = load_float dispatch[FLOAT] = load_float
def load_binfloat(self, unpack=struct.unpack): def load_binfloat(self, unpack=struct.unpack):
@ -872,7 +875,7 @@ class Unpickler:
def load_stop(self): def load_stop(self):
value = self.stack[-1] value = self.stack[-1]
del self.stack[-1] del self.stack[-1]
raise STOP, value raise _Stop(value)
dispatch[STOP] = load_stop dispatch[STOP] = load_stop
# Helper class for load_inst/load_obj # Helper class for load_inst/load_obj