mirror of
https://github.com/python/cpython.git
synced 2025-11-08 13:42:22 +00:00
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55413 | fred.drake | 2007-05-17 12:30:10 -0700 (Thu, 17 May 2007) | 1 line
fix argument name in documentation; match the implementation
................
r55430 | jack.diederich | 2007-05-18 06:39:59 -0700 (Fri, 18 May 2007) | 1 line
Implements class decorators, PEP 3129.
................
r55432 | guido.van.rossum | 2007-05-18 08:09:41 -0700 (Fri, 18 May 2007) | 2 lines
obsubmit.
................
r55434 | guido.van.rossum | 2007-05-18 09:39:10 -0700 (Fri, 18 May 2007) | 3 lines
Fix bug in test_inspect. (I presume this is how it should be fixed;
Jack Diedrich, please verify.)
................
r55460 | brett.cannon | 2007-05-20 00:31:57 -0700 (Sun, 20 May 2007) | 4 lines
Remove the imageop module. With imgfile already removed in Python 3.0 and
rgbimg gone in Python 2.6 the unit tests themselves were made worthless. Plus
third-party libraries perform the same function much better.
................
r55469 | neal.norwitz | 2007-05-20 11:28:20 -0700 (Sun, 20 May 2007) | 118 lines
Merged revisions 55324-55467 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55348 | georg.brandl | 2007-05-15 13:19:34 -0700 (Tue, 15 May 2007) | 4 lines
HTML-escape the plain traceback in cgitb's HTML output, to prevent
the traceback inadvertently or maliciously closing the comment and
injecting HTML into the error page.
........
r55372 | neal.norwitz | 2007-05-15 21:33:50 -0700 (Tue, 15 May 2007) | 6 lines
Port rev 55353 from Guido:
Add what looks like a necessary call to PyErr_NoMemory() when PyMem_MALLOC()
fails.
Will backport.
........
r55377 | neal.norwitz | 2007-05-15 22:06:33 -0700 (Tue, 15 May 2007) | 1 line
Mention removal of some directories for obsolete platforms
........
r55380 | brett.cannon | 2007-05-15 22:50:03 -0700 (Tue, 15 May 2007) | 2 lines
Change the maintainer of the BeOS port.
........
r55383 | georg.brandl | 2007-05-16 06:44:18 -0700 (Wed, 16 May 2007) | 2 lines
Bug #1719995: don't use deprecated method in sets example.
........
r55386 | neal.norwitz | 2007-05-16 13:05:11 -0700 (Wed, 16 May 2007) | 5 lines
Fix bug in marshal where bad data would cause a segfault due to
lack of an infinite recursion check.
Contributed by Damien Miller at Google.
........
r55389 | brett.cannon | 2007-05-16 15:42:29 -0700 (Wed, 16 May 2007) | 6 lines
Remove the gopherlib module. It has been raising a DeprecationWarning since
Python 2.5.
Also remove gopher support from urllib/urllib2. As both imported gopherlib the
usage of the support would have raised a DeprecationWarning.
........
r55394 | raymond.hettinger | 2007-05-16 18:08:04 -0700 (Wed, 16 May 2007) | 1 line
calendar.py gets no benefit from xrange() instead of range()
........
r55395 | brett.cannon | 2007-05-16 19:02:56 -0700 (Wed, 16 May 2007) | 3 lines
Complete deprecation of BaseException.message. Some subclasses were directly
accessing the message attribute instead of using the descriptor.
........
r55396 | neal.norwitz | 2007-05-16 23:11:36 -0700 (Wed, 16 May 2007) | 4 lines
Reduce the max stack depth to see if this fixes the segfaults on
Windows and some other boxes. If this is successful, this rev should
be backported. I'm not sure how close to the limit we should push this.
........
r55397 | neal.norwitz | 2007-05-16 23:23:50 -0700 (Wed, 16 May 2007) | 4 lines
Set the depth to something very small to try to determine if the
crashes on Windows are really due to the stack size or possibly
some other problem.
........
r55398 | neal.norwitz | 2007-05-17 00:04:46 -0700 (Thu, 17 May 2007) | 4 lines
Last try for tweaking the max stack depth. 5000 was the original value,
4000 didn't work either. 1000 does work on Windows. If 2000 works,
that will hopefully be a reasonable balance.
........
r55412 | fred.drake | 2007-05-17 12:29:58 -0700 (Thu, 17 May 2007) | 1 line
fix argument name in documentation; match the implementation
........
r55427 | neal.norwitz | 2007-05-17 22:47:16 -0700 (Thu, 17 May 2007) | 1 line
Verify neither dumps or loads overflow the stack and segfault.
........
r55446 | collin.winter | 2007-05-18 16:11:24 -0700 (Fri, 18 May 2007) | 1 line
Backport PEP 3110's new 'except' syntax to 2.6.
........
r55448 | raymond.hettinger | 2007-05-18 18:11:16 -0700 (Fri, 18 May 2007) | 1 line
Improvements to NamedTuple's implementation, tests, and documentation
........
r55449 | raymond.hettinger | 2007-05-18 18:50:11 -0700 (Fri, 18 May 2007) | 1 line
Fix beginner mistake -- don't mix spaces and tabs.
........
r55450 | neal.norwitz | 2007-05-18 20:48:47 -0700 (Fri, 18 May 2007) | 1 line
Clear data so random memory does not get freed. Will backport.
........
r55452 | neal.norwitz | 2007-05-18 21:34:55 -0700 (Fri, 18 May 2007) | 3 lines
Whoops, need to pay attention to those test failures.
Move the clear to *before* the first use, not after.
........
r55453 | neal.norwitz | 2007-05-18 21:35:52 -0700 (Fri, 18 May 2007) | 1 line
Give some clue as to what happened if the test fails.
........
r55455 | georg.brandl | 2007-05-19 11:09:26 -0700 (Sat, 19 May 2007) | 2 lines
Fix docstring for add_package in site.py.
........
r55458 | brett.cannon | 2007-05-20 00:09:50 -0700 (Sun, 20 May 2007) | 2 lines
Remove the rgbimg module. It has been deprecated since Python 2.5.
........
r55465 | nick.coghlan | 2007-05-20 04:12:49 -0700 (Sun, 20 May 2007) | 1 line
Fix typo in example (should be backported, but my maintenance branch is woefully out of date)
........
................
r55472 | brett.cannon | 2007-05-20 12:06:18 -0700 (Sun, 20 May 2007) | 2 lines
Remove imageop from the Windows build process.
................
r55486 | neal.norwitz | 2007-05-20 23:59:52 -0700 (Sun, 20 May 2007) | 1 line
Remove callable() builtin
................
r55506 | neal.norwitz | 2007-05-22 00:43:29 -0700 (Tue, 22 May 2007) | 78 lines
Merged revisions 55468-55505 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55468 | neal.norwitz | 2007-05-20 11:06:27 -0700 (Sun, 20 May 2007) | 1 line
rotor is long gone.
........
r55470 | neal.norwitz | 2007-05-20 11:43:00 -0700 (Sun, 20 May 2007) | 1 line
Update directories/files at the top-level.
........
r55471 | brett.cannon | 2007-05-20 12:05:06 -0700 (Sun, 20 May 2007) | 2 lines
Try to remove rgbimg from Windows builds.
........
r55474 | brett.cannon | 2007-05-20 16:17:38 -0700 (Sun, 20 May 2007) | 4 lines
Remove the macfs module. This led to the deprecation of macostools.touched();
it completely relied on macfs and is a no-op on OS X according to code
comments.
........
r55476 | brett.cannon | 2007-05-20 16:56:18 -0700 (Sun, 20 May 2007) | 3 lines
Move imgfile import to the global namespace to trigger an import error ASAP to
prevent creation of a test file.
........
r55477 | brett.cannon | 2007-05-20 16:57:38 -0700 (Sun, 20 May 2007) | 3 lines
Cause posixfile to raise a DeprecationWarning. Documented as deprecated since
Ptyhon 1.5.
........
r55479 | andrew.kuchling | 2007-05-20 17:03:15 -0700 (Sun, 20 May 2007) | 1 line
Note removed modules
........
r55481 | martin.v.loewis | 2007-05-20 21:35:47 -0700 (Sun, 20 May 2007) | 2 lines
Add Alexandre Vassalotti.
........
r55482 | george.yoshida | 2007-05-20 21:41:21 -0700 (Sun, 20 May 2007) | 4 lines
fix against r55474 [Remove the macfs module]
Remove "libmacfs.tex" from Makefile.deps and mac/mac.tex.
........
r55487 | raymond.hettinger | 2007-05-21 01:13:35 -0700 (Mon, 21 May 2007) | 1 line
Replace assertion with straight error-checking.
........
r55489 | raymond.hettinger | 2007-05-21 09:40:10 -0700 (Mon, 21 May 2007) | 1 line
Allow all alphanumeric and underscores in type and field names.
........
r55490 | facundo.batista | 2007-05-21 10:32:32 -0700 (Mon, 21 May 2007) | 5 lines
Added timeout support to HTTPSConnection, through the
socket.create_connection function. Also added a small
test for this, and updated NEWS file.
........
r55495 | georg.brandl | 2007-05-21 13:34:16 -0700 (Mon, 21 May 2007) | 2 lines
Patch #1686487: you can now pass any mapping after '**' in function calls.
........
r55502 | neal.norwitz | 2007-05-21 23:03:36 -0700 (Mon, 21 May 2007) | 1 line
Document new params to HTTPSConnection
........
r55504 | neal.norwitz | 2007-05-22 00:16:10 -0700 (Tue, 22 May 2007) | 1 line
Stop using METH_OLDARGS
........
r55505 | neal.norwitz | 2007-05-22 00:16:44 -0700 (Tue, 22 May 2007) | 1 line
Stop using METH_OLDARGS implicitly
........
................
196 lines
6.5 KiB
Python
196 lines
6.5 KiB
Python
"""Helper to provide extensibility for pickle/cPickle.
|
|
|
|
This is only useful to add pickle support for extension types defined in
|
|
C, not for instances of user-defined classes.
|
|
"""
|
|
|
|
__all__ = ["pickle", "constructor",
|
|
"add_extension", "remove_extension", "clear_extension_cache"]
|
|
|
|
dispatch_table = {}
|
|
|
|
def pickle(ob_type, pickle_function, constructor_ob=None):
|
|
if not hasattr(pickle_function, '__call__'):
|
|
raise TypeError("reduction functions must be callable")
|
|
dispatch_table[ob_type] = pickle_function
|
|
|
|
# The constructor_ob function is a vestige of safe for unpickling.
|
|
# There is no reason for the caller to pass it anymore.
|
|
if constructor_ob is not None:
|
|
constructor(constructor_ob)
|
|
|
|
def constructor(object):
|
|
if not hasattr(object, '__call__'):
|
|
raise TypeError("constructors must be callable")
|
|
|
|
# Example: provide pickling support for complex numbers.
|
|
|
|
try:
|
|
complex
|
|
except NameError:
|
|
pass
|
|
else:
|
|
|
|
def pickle_complex(c):
|
|
return complex, (c.real, c.imag)
|
|
|
|
pickle(complex, pickle_complex, complex)
|
|
|
|
# Support for pickling new-style objects
|
|
|
|
def _reconstructor(cls, base, state):
|
|
if base is object:
|
|
obj = object.__new__(cls)
|
|
else:
|
|
obj = base.__new__(cls, state)
|
|
if base.__init__ != object.__init__:
|
|
base.__init__(obj, state)
|
|
return obj
|
|
|
|
_HEAPTYPE = 1<<9
|
|
|
|
# Python code for object.__reduce_ex__ for protocols 0 and 1
|
|
|
|
def _reduce_ex(self, proto):
|
|
assert proto < 2
|
|
for base in self.__class__.__mro__:
|
|
if hasattr(base, '__flags__') and not base.__flags__ & _HEAPTYPE:
|
|
break
|
|
else:
|
|
base = object # not really reachable
|
|
if base is object:
|
|
state = None
|
|
else:
|
|
if base is self.__class__:
|
|
raise TypeError, "can't pickle %s objects" % base.__name__
|
|
state = base(self)
|
|
args = (self.__class__, base, state)
|
|
try:
|
|
getstate = self.__getstate__
|
|
except AttributeError:
|
|
if getattr(self, "__slots__", None):
|
|
raise TypeError("a class that defines __slots__ without "
|
|
"defining __getstate__ cannot be pickled")
|
|
try:
|
|
dict = self.__dict__
|
|
except AttributeError:
|
|
dict = None
|
|
else:
|
|
dict = getstate()
|
|
if dict:
|
|
return _reconstructor, args, dict
|
|
else:
|
|
return _reconstructor, args
|
|
|
|
# Helper for __reduce_ex__ protocol 2
|
|
|
|
def __newobj__(cls, *args):
|
|
return cls.__new__(cls, *args)
|
|
|
|
def _slotnames(cls):
|
|
"""Return a list of slot names for a given class.
|
|
|
|
This needs to find slots defined by the class and its bases, so we
|
|
can't simply return the __slots__ attribute. We must walk down
|
|
the Method Resolution Order and concatenate the __slots__ of each
|
|
class found there. (This assumes classes don't modify their
|
|
__slots__ attribute to misrepresent their slots after the class is
|
|
defined.)
|
|
"""
|
|
|
|
# Get the value from a cache in the class if possible
|
|
names = cls.__dict__.get("__slotnames__")
|
|
if names is not None:
|
|
return names
|
|
|
|
# Not cached -- calculate the value
|
|
names = []
|
|
if not hasattr(cls, "__slots__"):
|
|
# This class has no slots
|
|
pass
|
|
else:
|
|
# Slots found -- gather slot names from all base classes
|
|
for c in cls.__mro__:
|
|
if "__slots__" in c.__dict__:
|
|
slots = c.__dict__['__slots__']
|
|
# if class has a single slot, it can be given as a string
|
|
if isinstance(slots, basestring):
|
|
slots = (slots,)
|
|
for name in slots:
|
|
# special descriptors
|
|
if name in ("__dict__", "__weakref__"):
|
|
continue
|
|
# mangled names
|
|
elif name.startswith('__') and not name.endswith('__'):
|
|
names.append('_%s%s' % (c.__name__, name))
|
|
else:
|
|
names.append(name)
|
|
|
|
# Cache the outcome in the class if at all possible
|
|
try:
|
|
cls.__slotnames__ = names
|
|
except:
|
|
pass # But don't die if we can't
|
|
|
|
return names
|
|
|
|
# A registry of extension codes. This is an ad-hoc compression
|
|
# mechanism. Whenever a global reference to <module>, <name> is about
|
|
# to be pickled, the (<module>, <name>) tuple is looked up here to see
|
|
# if it is a registered extension code for it. Extension codes are
|
|
# universal, so that the meaning of a pickle does not depend on
|
|
# context. (There are also some codes reserved for local use that
|
|
# don't have this restriction.) Codes are positive ints; 0 is
|
|
# reserved.
|
|
|
|
_extension_registry = {} # key -> code
|
|
_inverted_registry = {} # code -> key
|
|
_extension_cache = {} # code -> object
|
|
# Don't ever rebind those names: cPickle grabs a reference to them when
|
|
# it's initialized, and won't see a rebinding.
|
|
|
|
def add_extension(module, name, code):
|
|
"""Register an extension code."""
|
|
code = int(code)
|
|
if not 1 <= code <= 0x7fffffff:
|
|
raise ValueError, "code out of range"
|
|
key = (module, name)
|
|
if (_extension_registry.get(key) == code and
|
|
_inverted_registry.get(code) == key):
|
|
return # Redundant registrations are benign
|
|
if key in _extension_registry:
|
|
raise ValueError("key %s is already registered with code %s" %
|
|
(key, _extension_registry[key]))
|
|
if code in _inverted_registry:
|
|
raise ValueError("code %s is already in use for key %s" %
|
|
(code, _inverted_registry[code]))
|
|
_extension_registry[key] = code
|
|
_inverted_registry[code] = key
|
|
|
|
def remove_extension(module, name, code):
|
|
"""Unregister an extension code. For testing only."""
|
|
key = (module, name)
|
|
if (_extension_registry.get(key) != code or
|
|
_inverted_registry.get(code) != key):
|
|
raise ValueError("key %s is not registered with code %s" %
|
|
(key, code))
|
|
del _extension_registry[key]
|
|
del _inverted_registry[code]
|
|
if code in _extension_cache:
|
|
del _extension_cache[code]
|
|
|
|
def clear_extension_cache():
|
|
_extension_cache.clear()
|
|
|
|
# Standard extension code assignments
|
|
|
|
# Reserved ranges
|
|
|
|
# First Last Count Purpose
|
|
# 1 127 127 Reserved for Python standard library
|
|
# 128 191 64 Reserved for Zope
|
|
# 192 239 48 Reserved for 3rd parties
|
|
# 240 255 16 Reserved for private use (will never be assigned)
|
|
# 256 Inf Inf Reserved for future assignment
|
|
|
|
# Extension codes are assigned by the Python Software Foundation.
|