mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Reduce the usage of the types module.

Browse source
This commit is contained in:
Raymond Hettinger 2005-02-07 14:16:21 +00:00
parent a164574937
commit f715366f23
8 changed files with 64 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Lib/pickle.py
View file

@ -288,7 +288,7 @@ class Pickler:
# Check for a class with a custom metaclass; treat as regular class
try:
issc = issubclass(t, TypeType)
issc = issubclass(t, type)
except TypeError: # t is not a class (old Boost; see SF #502085)
issc = 0
if issc:
@ -313,12 +313,12 @@ class Pickler:
(t.__name__, obj))
# Check for string returned by reduce(), meaning "save as global"
if type(rv) is StringType:
if type(rv) is str:
self.save_global(obj, rv)
return
# Assert that reduce() returned a tuple
if type(rv) is not TupleType:
if type(rv) is not tuple:
raise PicklingError("%s must return string or tuple" % reduce)
# Assert that it returned an appropriately sized tuple
@ -347,7 +347,7 @@ class Pickler:
# This API is called by some subclasses
# Assert that args is a tuple or None
if not isinstance(args, TupleType):
if not isinstance(args, tuple):
raise PicklingError("args from reduce() should be a tuple")
# Assert that func is callable
@ -425,7 +425,7 @@ class Pickler:
def save_none(self, obj):
self.write(NONE)
dispatch[NoneType] = save_none
dispatch[type(None)] = save_none
def save_bool(self, obj):
if self.proto >= 2:
@ -456,7 +456,7 @@ class Pickler:
return
# Text pickle, or int too big to fit in signed 4-byte format.
self.write(INT + repr(obj) + '\n')
dispatch[IntType] = save_int
dispatch[int] = save_int
def save_long(self, obj, pack=struct.pack):
if self.proto >= 2:
@ -468,14 +468,14 @@ class Pickler:
self.write(LONG4 + pack("<i", n) + bytes)
return
self.write(LONG + repr(obj) + '\n')
dispatch[LongType] = save_long
dispatch[long] = save_long
def save_float(self, obj, pack=struct.pack):
if self.bin:
self.write(BINFLOAT + pack('>d', obj))
else:
self.write(FLOAT + repr(obj) + '\n')
dispatch[FloatType] = save_float
dispatch[float] = save_float
def save_string(self, obj, pack=struct.pack):
if self.bin:
@ -487,7 +487,7 @@ class Pickler:
else:
self.write(STRING + repr(obj) + '\n')
self.memoize(obj)
dispatch[StringType] = save_string
dispatch[str] = save_string
def save_unicode(self, obj, pack=struct.pack):
if self.bin:
@ -501,7 +501,7 @@ class Pickler:
self.memoize(obj)
dispatch[UnicodeType] = save_unicode
if StringType == UnicodeType:
if str == UnicodeType:
# This is true for Jython
def save_string(self, obj, pack=struct.pack):
unicode = obj.isunicode()
@ -527,7 +527,7 @@ class Pickler:
else:
self.write(STRING + repr(obj) + '\n')
self.memoize(obj)
dispatch[StringType] = save_string
dispatch[str] = save_string
def save_tuple(self, obj):
write = self.write
@ -580,7 +580,7 @@ class Pickler:
self.write(TUPLE)
self.memoize(obj)
dispatch[TupleType] = save_tuple
dispatch[tuple] = save_tuple
# save_empty_tuple() isn't used by anything in Python 2.3. However, I
# found a Pickler subclass in Zope3 that calls it, so it's not harmless
@ -599,7 +599,7 @@ class Pickler:
self.memoize(obj)
self._batch_appends(iter(obj))
dispatch[ListType] = save_list
dispatch[list] = save_list
# Keep in synch with cPickle's BATCHSIZE. Nothing will break if it gets
# out of synch, though.
@ -648,7 +648,7 @@ class Pickler:
self.memoize(obj)
self._batch_setitems(obj.iteritems())
dispatch[DictionaryType] = save_dict
dispatch[dict] = save_dict
if not PyStringMap is None:
dispatch[PyStringMap] = save_dict
@ -770,7 +770,7 @@ class Pickler:
dispatch[ClassType] = save_global
dispatch[FunctionType] = save_global
dispatch[BuiltinFunctionType] = save_global
dispatch[TypeType] = save_global
dispatch[type] = save_global
# Pickling helpers