mirror of
https://github.com/python/cpython.git
synced 2025-10-26 03:04:41 +00:00
merge in bad ways, so I'll have to merge that extra-carefully (probably manually.)
Merged revisions 46495-46605 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r46495 | tim.peters | 2006-05-28 03:52:38 +0200 (Sun, 28 May 2006) | 2 lines
Added missing svn:eol-style property to text files.
........
r46497 | tim.peters | 2006-05-28 12:41:29 +0200 (Sun, 28 May 2006) | 3 lines
PyErr_Display(), PyErr_WriteUnraisable(): Coverity found a cut-and-paste
bug in both: `className` was referenced before being checked for NULL.
........
r46499 | fredrik.lundh | 2006-05-28 14:06:46 +0200 (Sun, 28 May 2006) | 5 lines
needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only),
and use it for string copy operations. this gives a 20% speedup on some
string benchmarks.
........
r46501 | michael.hudson | 2006-05-28 17:51:40 +0200 (Sun, 28 May 2006) | 26 lines
Quality control, meet exceptions.c.
Fix a number of problems with the need for speed code:
One is doing this sort of thing:
Py_DECREF(self->field);
self->field = newval;
Py_INCREF(self->field);
without being very sure that self->field doesn't start with a
value that has a __del__, because that almost certainly can lead
to segfaults.
As self->args is constrained to be an exact tuple we may as well
exploit this fact consistently. This leads to quite a lot of
simplification (and, hey, probably better performance).
Add some error checking in places lacking it.
Fix some rather strange indentation in the Unicode code.
Delete some trailing whitespace.
More to come, I haven't fixed all the reference leaks yet...
........
r46502 | george.yoshida | 2006-05-28 18:39:09 +0200 (Sun, 28 May 2006) | 3 lines
Patch #1080727: add "encoding" parameter to doctest.DocFileSuite
Contributed by Bjorn Tillenius.
........
r46503 | martin.v.loewis | 2006-05-28 18:57:38 +0200 (Sun, 28 May 2006) | 4 lines
Rest of patch #1490384: Commit icon source, remove
claim that Erik von Blokland is the author of the
installer picture.
........
r46504 | michael.hudson | 2006-05-28 19:40:29 +0200 (Sun, 28 May 2006) | 16 lines
Quality control, meet exceptions.c, round two.
Make some functions that should have been static static.
Fix a bunch of refleaks by fixing the definition of
MiddlingExtendsException.
Remove all the __new__ implementations apart from
BaseException_new. Rewrite most code that needs it to cope with
NULL fields (such code could get excercised anyway, the
__new__-removal just makes it more likely). This involved
editing the code for WindowsError, which I can't test.
This fixes all the refleaks in at least the start of a regrtest
-R :: run.
........
r46505 | marc-andre.lemburg | 2006-05-28 19:46:58 +0200 (Sun, 28 May 2006) | 10 lines
Initial version of systimes - a module to provide platform dependent
performance measurements.
The module is currently just a proof-of-concept implementation, but
will integrated into pybench once it is stable enough.
License: pybench license.
Author: Marc-Andre Lemburg.
........
r46507 | armin.rigo | 2006-05-28 21:13:17 +0200 (Sun, 28 May 2006) | 15 lines
("Forward-port" of r46506)
Remove various dependencies on dictionary order in the standard library
tests, and one (clearly an oversight, potentially critical) in the
standard library itself - base64.py.
Remaining open issues:
* test_extcall is an output test, messy to make robust
* tarfile.py has a potential bug here, but I'm not familiar
enough with this code. Filed in as SF bug #1496501.
* urllib2.HTTPPasswordMgr() returns a random result if there is more
than one matching root path. I'm asking python-dev for
clarification...
........
r46508 | georg.brandl | 2006-05-28 22:11:45 +0200 (Sun, 28 May 2006) | 4 lines
The empty string is a valid import path.
(fixes #1496539)
........
r46509 | georg.brandl | 2006-05-28 22:23:12 +0200 (Sun, 28 May 2006) | 3 lines
Patch #1496206: urllib2 PasswordMgr ./. default ports
........
r46510 | georg.brandl | 2006-05-28 22:57:09 +0200 (Sun, 28 May 2006) | 3 lines
Fix refleaks in UnicodeError get and set methods.
........
r46511 | michael.hudson | 2006-05-28 23:19:03 +0200 (Sun, 28 May 2006) | 3 lines
use the UnicodeError traversal and clearing functions in UnicodeError
subclasses.
........
r46512 | thomas.wouters | 2006-05-28 23:32:12 +0200 (Sun, 28 May 2006) | 4 lines
Make last patch valid C89 so Windows compilers can deal with it.
........
r46513 | georg.brandl | 2006-05-28 23:42:54 +0200 (Sun, 28 May 2006) | 3 lines
Fix ref-antileak in _struct.c which eventually lead to deallocating None.
........
r46514 | georg.brandl | 2006-05-28 23:57:35 +0200 (Sun, 28 May 2006) | 4 lines
Correct None refcount issue in Mac modules. (Are they
still used?)
........
r46515 | armin.rigo | 2006-05-29 00:07:08 +0200 (Mon, 29 May 2006) | 3 lines
A clearer error message when passing -R to regrtest.py with
release builds of Python.
........
r46516 | georg.brandl | 2006-05-29 00:14:04 +0200 (Mon, 29 May 2006) | 3 lines
Fix C function calling conventions in _sre module.
........
r46517 | georg.brandl | 2006-05-29 00:34:51 +0200 (Mon, 29 May 2006) | 3 lines
Convert audioop over to METH_VARARGS.
........
r46518 | georg.brandl | 2006-05-29 00:38:57 +0200 (Mon, 29 May 2006) | 3 lines
METH_NOARGS functions do get called with two args.
........
r46519 | georg.brandl | 2006-05-29 11:46:51 +0200 (Mon, 29 May 2006) | 4 lines
Fix refleak in socketmodule. Replace bogus Py_BuildValue calls.
Fix refleak in exceptions.
........
r46520 | nick.coghlan | 2006-05-29 14:43:05 +0200 (Mon, 29 May 2006) | 7 lines
Apply modified version of Collin Winter's patch #1478788
Renames functional extension module to _functools and adds a Python
functools module so that utility functions like update_wrapper can be
added easily.
........
r46522 | georg.brandl | 2006-05-29 15:53:16 +0200 (Mon, 29 May 2006) | 3 lines
Convert fmmodule to METH_VARARGS.
........
r46523 | georg.brandl | 2006-05-29 16:13:21 +0200 (Mon, 29 May 2006) | 3 lines
Fix #1494605.
........
r46524 | georg.brandl | 2006-05-29 16:28:05 +0200 (Mon, 29 May 2006) | 3 lines
Handle PyMem_Malloc failure in pystrtod.c. Closes #1494671.
........
r46525 | georg.brandl | 2006-05-29 16:33:55 +0200 (Mon, 29 May 2006) | 3 lines
Fix compiler warning.
........
r46526 | georg.brandl | 2006-05-29 16:39:00 +0200 (Mon, 29 May 2006) | 3 lines
Fix #1494787 (pyclbr counts whitespace as superclass name)
........
r46527 | bob.ippolito | 2006-05-29 17:47:29 +0200 (Mon, 29 May 2006) | 1 line
simplify the struct code a bit (no functional changes)
........
r46528 | armin.rigo | 2006-05-29 19:59:47 +0200 (Mon, 29 May 2006) | 2 lines
Silence a warning.
........
r46529 | georg.brandl | 2006-05-29 21:39:45 +0200 (Mon, 29 May 2006) | 3 lines
Correct some value converting strangenesses.
........
r46530 | nick.coghlan | 2006-05-29 22:27:44 +0200 (Mon, 29 May 2006) | 1 line
When adding a module like functools, it helps to let SVN know about the file.
........
r46531 | georg.brandl | 2006-05-29 22:52:54 +0200 (Mon, 29 May 2006) | 4 lines
Patches #1497027 and #972322: try HTTP digest auth first,
and watch out for handler name collisions.
........
r46532 | georg.brandl | 2006-05-29 22:57:01 +0200 (Mon, 29 May 2006) | 3 lines
Add News entry for last commit.
........
r46533 | georg.brandl | 2006-05-29 23:04:52 +0200 (Mon, 29 May 2006) | 4 lines
Make use of METH_O and METH_NOARGS where possible.
Use Py_UnpackTuple instead of PyArg_ParseTuple where possible.
........
r46534 | georg.brandl | 2006-05-29 23:58:42 +0200 (Mon, 29 May 2006) | 3 lines
Convert more modules to METH_VARARGS.
........
r46535 | georg.brandl | 2006-05-30 00:00:30 +0200 (Tue, 30 May 2006) | 3 lines
Whoops.
........
r46536 | fredrik.lundh | 2006-05-30 00:42:07 +0200 (Tue, 30 May 2006) | 4 lines
fixed "abc".count("", 100) == -96 error (hopefully, nobody's relying on
the current behaviour ;-)
........
r46537 | bob.ippolito | 2006-05-30 00:55:48 +0200 (Tue, 30 May 2006) | 1 line
struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly)
........
r46539 | bob.ippolito | 2006-05-30 02:26:01 +0200 (Tue, 30 May 2006) | 1 line
Add a length check to aifc to ensure it doesn't write a bogus file
........
r46540 | tim.peters | 2006-05-30 04:25:25 +0200 (Tue, 30 May 2006) | 10 lines
deprecated_err(): Stop bizarre warning messages when the tests
are run in the order:
test_genexps (or any other doctest-based test)
test_struct
test_doctest
The `warnings` module needs an advertised way to save/restore
its internal filter list.
........
r46541 | tim.peters | 2006-05-30 04:26:46 +0200 (Tue, 30 May 2006) | 2 lines
Whitespace normalization.
........
r46542 | tim.peters | 2006-05-30 04:30:30 +0200 (Tue, 30 May 2006) | 2 lines
Set a binary svn:mime-type property on this UTF-8 encoded file.
........
r46543 | neal.norwitz | 2006-05-30 05:18:50 +0200 (Tue, 30 May 2006) | 1 line
Simplify further by using AddStringConstant
........
r46544 | tim.peters | 2006-05-30 06:16:25 +0200 (Tue, 30 May 2006) | 6 lines
Convert relevant dict internals to Py_ssize_t.
I don't have a box with nearly enough RAM, or an OS,
that could get close to tickling this, though (requires
a dict w/ at least 2**31 entries).
........
r46545 | neal.norwitz | 2006-05-30 06:19:21 +0200 (Tue, 30 May 2006) | 1 line
Remove stray | in comment
........
r46546 | neal.norwitz | 2006-05-30 06:25:05 +0200 (Tue, 30 May 2006) | 1 line
Use Py_SAFE_DOWNCAST for safety. Fix format strings. Remove 2 more stray | in comment
........
r46547 | neal.norwitz | 2006-05-30 06:43:23 +0200 (Tue, 30 May 2006) | 1 line
No DOWNCAST is required since sizeof(Py_ssize_t) >= sizeof(int) and Py_ReprEntr returns an int
........
r46548 | tim.peters | 2006-05-30 07:04:59 +0200 (Tue, 30 May 2006) | 3 lines
dict_print(): Explicitly narrow the return value
from a (possibly) wider variable.
........
r46549 | tim.peters | 2006-05-30 07:23:59 +0200 (Tue, 30 May 2006) | 5 lines
dict_print(): So that Neal & I don't spend the rest of
our lives taking turns rewriting code that works ;-),
get rid of casting illusions by declaring a new variable
with the obvious type.
........
r46550 | georg.brandl | 2006-05-30 09:04:55 +0200 (Tue, 30 May 2006) | 3 lines
Restore exception pickle support. #1497319.
........
r46551 | georg.brandl | 2006-05-30 09:13:29 +0200 (Tue, 30 May 2006) | 3 lines
Add a test case for exception pickling. args is never NULL.
........
r46552 | neal.norwitz | 2006-05-30 09:21:10 +0200 (Tue, 30 May 2006) | 1 line
Don't fail if the (sub)pkgname already exist.
........
r46553 | georg.brandl | 2006-05-30 09:34:45 +0200 (Tue, 30 May 2006) | 3 lines
Disallow keyword args for exceptions.
........
r46554 | neal.norwitz | 2006-05-30 09:36:54 +0200 (Tue, 30 May 2006) | 5 lines
I'm impatient. I think this will fix a few more problems with the buildbots.
I'm not sure this is the best approach, but I can't think of anything better.
If this creates problems, feel free to revert, but I think it's safe and
should make things a little better.
........
r46555 | georg.brandl | 2006-05-30 10:17:00 +0200 (Tue, 30 May 2006) | 4 lines
Do the check for no keyword arguments in __init__ so that
subclasses of Exception can be supplied keyword args
........
r46556 | georg.brandl | 2006-05-30 10:47:19 +0200 (Tue, 30 May 2006) | 3 lines
Convert test_exceptions to unittest.
........
r46557 | andrew.kuchling | 2006-05-30 14:52:01 +0200 (Tue, 30 May 2006) | 1 line
Add SoC name, and reorganize this section a bit
........
r46559 | tim.peters | 2006-05-30 17:53:34 +0200 (Tue, 30 May 2006) | 11 lines
PyLong_FromString(): Continued fraction analysis (explained in
a new comment) suggests there are almost certainly large input
integers in all non-binary input bases for which one Python digit
too few is initally allocated to hold the final result. Instead
of assert-failing when that happens, allocate more space. Alas,
I estimate it would take a few days to find a specific such case,
so this isn't backed up by a new test (not to mention that such
a case may take hours to run, since conversion time is quadratic
in the number of digits, and preliminary attempts suggested that
the smallest such inputs contain at least a million digits).
........
r46560 | fredrik.lundh | 2006-05-30 19:11:48 +0200 (Tue, 30 May 2006) | 3 lines
changed find/rfind to return -1 for matches outside the source string
........
r46561 | bob.ippolito | 2006-05-30 19:37:54 +0200 (Tue, 30 May 2006) | 1 line
Change wrapping terminology to overflow masking
........
r46562 | fredrik.lundh | 2006-05-30 19:39:58 +0200 (Tue, 30 May 2006) | 3 lines
changed count to return 0 for slices outside the source string
........
r46568 | tim.peters | 2006-05-31 01:28:02 +0200 (Wed, 31 May 2006) | 2 lines
Whitespace normalization.
........
r46569 | brett.cannon | 2006-05-31 04:19:54 +0200 (Wed, 31 May 2006) | 5 lines
Clarify wording on default values for strptime(); defaults are used when better
values cannot be inferred.
Closes bug #1496315.
........
r46572 | neal.norwitz | 2006-05-31 09:43:27 +0200 (Wed, 31 May 2006) | 1 line
Calculate smallest properly (it was off by one) and use proper ssize_t types for Win64
........
r46573 | neal.norwitz | 2006-05-31 10:01:08 +0200 (Wed, 31 May 2006) | 1 line
Revert last checkin, it is better to do make distclean
........
r46574 | neal.norwitz | 2006-05-31 11:02:44 +0200 (Wed, 31 May 2006) | 3 lines
On 64-bit platforms running test_struct after test_tarfile would fail
since the deprecation warning wouldn't be raised.
........
r46575 | thomas.heller | 2006-05-31 13:37:58 +0200 (Wed, 31 May 2006) | 3 lines
PyTuple_Pack is not available in Python 2.3, but ctypes must stay
compatible with that.
........
r46576 | andrew.kuchling | 2006-05-31 15:18:56 +0200 (Wed, 31 May 2006) | 1 line
'functional' module was renamed to 'functools'
........
r46577 | kristjan.jonsson | 2006-05-31 15:35:41 +0200 (Wed, 31 May 2006) | 1 line
Fixup the PCBuild8 project directory. exceptions.c have moved to Objects, and the functionalmodule.c has been replaced with _functoolsmodule.c. Other minor changes to .vcproj files and .sln to fix compilation
........
r46578 | andrew.kuchling | 2006-05-31 16:08:48 +0200 (Wed, 31 May 2006) | 15 lines
[Bug #1473048]
SimpleXMLRPCServer and DocXMLRPCServer don't look at
the path of the HTTP request at all; you can POST or
GET from / or /RPC2 or /blahblahblah with the same results.
Security scanners that look for /cgi-bin/phf will therefore report
lots of vulnerabilities.
Fix: add a .rpc_paths attribute to the SimpleXMLRPCServer class,
and report a 404 error if the path isn't on the allowed list.
Possibly-controversial aspect of this change: the default makes only
'/' and '/RPC2' legal. Maybe this will break people's applications
(though I doubt it). We could just set the default to an empty tuple,
which would exactly match the current behaviour.
........
r46579 | andrew.kuchling | 2006-05-31 16:12:47 +0200 (Wed, 31 May 2006) | 1 line
Mention SimpleXMLRPCServer change
........
r46580 | tim.peters | 2006-05-31 16:28:07 +0200 (Wed, 31 May 2006) | 2 lines
Trimmed trailing whitespace.
........
r46581 | tim.peters | 2006-05-31 17:33:22 +0200 (Wed, 31 May 2006) | 4 lines
_range_error(): Speed and simplify (there's no real need for
loops here). Assert that size_t is actually big enough, and
that f->size is at least one. Wrap a long line.
........
r46582 | tim.peters | 2006-05-31 17:34:37 +0200 (Wed, 31 May 2006) | 2 lines
Repaired error in new comment.
........
r46584 | neal.norwitz | 2006-06-01 07:32:49 +0200 (Thu, 01 Jun 2006) | 4 lines
Remove ; at end of macro. There was a compiler recently that warned
about extra semi-colons. It may have been the HP C compiler.
This file will trigger a bunch of those warnings now.
........
r46585 | georg.brandl | 2006-06-01 08:39:19 +0200 (Thu, 01 Jun 2006) | 3 lines
Correctly unpickle 2.4 exceptions via __setstate__ (patch #1498571)
........
r46586 | georg.brandl | 2006-06-01 10:27:32 +0200 (Thu, 01 Jun 2006) | 3 lines
Correctly allocate complex types with tp_alloc. (bug #1498638)
........
r46587 | georg.brandl | 2006-06-01 14:30:46 +0200 (Thu, 01 Jun 2006) | 2 lines
Correctly dispatch Faults in loads (patch #1498627)
........
r46588 | georg.brandl | 2006-06-01 15:00:49 +0200 (Thu, 01 Jun 2006) | 3 lines
Some code style tweaks, and remove apply.
........
r46589 | armin.rigo | 2006-06-01 15:19:12 +0200 (Thu, 01 Jun 2006) | 5 lines
[ 1497053 ] Let dicts propagate the exceptions in user __eq__().
[ 1456209 ] dictresize() vulnerability ( <- backport candidate ).
........
r46590 | tim.peters | 2006-06-01 15:41:46 +0200 (Thu, 01 Jun 2006) | 2 lines
Whitespace normalization.
........
r46591 | tim.peters | 2006-06-01 15:49:23 +0200 (Thu, 01 Jun 2006) | 2 lines
Record bugs 1275608 and 1456209 as being fixed.
........
r46592 | tim.peters | 2006-06-01 15:56:26 +0200 (Thu, 01 Jun 2006) | 5 lines
Re-enable a new empty-string test added during the NFS sprint,
but disabled then because str and unicode strings gave different
results. The implementations were repaired later during the
sprint, but the new test remained disabled.
........
r46594 | tim.peters | 2006-06-01 17:50:44 +0200 (Thu, 01 Jun 2006) | 7 lines
Armin committed his patch while I was reviewing it (I'm sure
he didn't know this), so merged in some changes I made during
review. Nothing material apart from changing a new `mask` local
from int to Py_ssize_t. Mostly this is repairing comments that
were made incorrect, and adding new comments. Also a few
minor code rewrites for clarity or helpful succinctness.
........
r46599 | neal.norwitz | 2006-06-02 06:45:53 +0200 (Fri, 02 Jun 2006) | 1 line
Convert docstrings to comments so regrtest -v prints method names
........
r46600 | neal.norwitz | 2006-06-02 06:50:49 +0200 (Fri, 02 Jun 2006) | 2 lines
Fix memory leak found by valgrind.
........
r46601 | neal.norwitz | 2006-06-02 06:54:52 +0200 (Fri, 02 Jun 2006) | 1 line
More memory leaks from valgrind
........
r46602 | neal.norwitz | 2006-06-02 08:23:00 +0200 (Fri, 02 Jun 2006) | 11 lines
Patch #1357836:
Prevent an invalid memory read from test_coding in case the done flag is set.
In that case, the loop isn't entered. I wonder if rather than setting
the done flag in the cases before the loop, if they should just exit early.
This code looks like it should be refactored.
Backport candidate (also the early break above if decoding_fgets fails)
........
r46603 | martin.blais | 2006-06-02 15:03:43 +0200 (Fri, 02 Jun 2006) | 1 line
Fixed struct test to not use unittest.
........
r46605 | tim.peters | 2006-06-03 01:22:51 +0200 (Sat, 03 Jun 2006) | 10 lines
pprint functions used to sort a dict (by key) if and only if
the output required more than one line. "Small" dicts got
displayed in seemingly random order (the hash-induced order
produced by dict.__repr__). None of this was documented.
Now pprint functions always sort dicts by key, and the docs
promise it.
This was proposed and agreed to during the PyCon 2006 core
sprint -- I just didn't have time for it before now.
........
2491 lines
59 KiB
C
2491 lines
59 KiB
C
|
|
/* Class object implementation */
|
|
|
|
#include "Python.h"
|
|
#include "structmember.h"
|
|
|
|
#define TP_DESCR_GET(t) \
|
|
(PyType_HasFeature(t, Py_TPFLAGS_HAVE_CLASS) ? (t)->tp_descr_get : NULL)
|
|
|
|
|
|
/* Forward */
|
|
static PyObject *class_lookup(PyClassObject *, PyObject *,
|
|
PyClassObject **);
|
|
static PyObject *instance_getattr1(PyInstanceObject *, PyObject *);
|
|
static PyObject *instance_getattr2(PyInstanceObject *, PyObject *);
|
|
|
|
static PyObject *getattrstr, *setattrstr, *delattrstr;
|
|
|
|
|
|
PyObject *
|
|
PyClass_New(PyObject *bases, PyObject *dict, PyObject *name)
|
|
/* bases is NULL or tuple of classobjects! */
|
|
{
|
|
PyClassObject *op, *dummy;
|
|
static PyObject *docstr, *modstr, *namestr;
|
|
if (docstr == NULL) {
|
|
docstr= PyString_InternFromString("__doc__");
|
|
if (docstr == NULL)
|
|
return NULL;
|
|
}
|
|
if (modstr == NULL) {
|
|
modstr= PyString_InternFromString("__module__");
|
|
if (modstr == NULL)
|
|
return NULL;
|
|
}
|
|
if (namestr == NULL) {
|
|
namestr= PyString_InternFromString("__name__");
|
|
if (namestr == NULL)
|
|
return NULL;
|
|
}
|
|
if (name == NULL || !PyString_Check(name)) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"PyClass_New: name must be a string");
|
|
return NULL;
|
|
}
|
|
if (dict == NULL || !PyDict_Check(dict)) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"PyClass_New: dict must be a dictionary");
|
|
return NULL;
|
|
}
|
|
if (PyDict_GetItem(dict, docstr) == NULL) {
|
|
if (PyDict_SetItem(dict, docstr, Py_None) < 0)
|
|
return NULL;
|
|
}
|
|
if (PyDict_GetItem(dict, modstr) == NULL) {
|
|
PyObject *globals = PyEval_GetGlobals();
|
|
if (globals != NULL) {
|
|
PyObject *modname = PyDict_GetItem(globals, namestr);
|
|
if (modname != NULL) {
|
|
if (PyDict_SetItem(dict, modstr, modname) < 0)
|
|
return NULL;
|
|
}
|
|
}
|
|
}
|
|
if (bases == NULL) {
|
|
bases = PyTuple_New(0);
|
|
if (bases == NULL)
|
|
return NULL;
|
|
}
|
|
else {
|
|
Py_ssize_t i, n;
|
|
PyObject *base;
|
|
if (!PyTuple_Check(bases)) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"PyClass_New: bases must be a tuple");
|
|
return NULL;
|
|
}
|
|
n = PyTuple_Size(bases);
|
|
for (i = 0; i < n; i++) {
|
|
base = PyTuple_GET_ITEM(bases, i);
|
|
if (!PyClass_Check(base)) {
|
|
if (PyCallable_Check(
|
|
(PyObject *) base->ob_type))
|
|
return PyObject_CallFunctionObjArgs(
|
|
(PyObject *) base->ob_type,
|
|
name, bases, dict, NULL);
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"PyClass_New: base must be a class");
|
|
return NULL;
|
|
}
|
|
}
|
|
Py_INCREF(bases);
|
|
}
|
|
op = PyObject_GC_New(PyClassObject, &PyClass_Type);
|
|
if (op == NULL) {
|
|
Py_DECREF(bases);
|
|
return NULL;
|
|
}
|
|
op->cl_bases = bases;
|
|
Py_INCREF(dict);
|
|
op->cl_dict = dict;
|
|
Py_XINCREF(name);
|
|
op->cl_name = name;
|
|
if (getattrstr == NULL) {
|
|
getattrstr = PyString_InternFromString("__getattr__");
|
|
setattrstr = PyString_InternFromString("__setattr__");
|
|
delattrstr = PyString_InternFromString("__delattr__");
|
|
}
|
|
op->cl_getattr = class_lookup(op, getattrstr, &dummy);
|
|
op->cl_setattr = class_lookup(op, setattrstr, &dummy);
|
|
op->cl_delattr = class_lookup(op, delattrstr, &dummy);
|
|
Py_XINCREF(op->cl_getattr);
|
|
Py_XINCREF(op->cl_setattr);
|
|
Py_XINCREF(op->cl_delattr);
|
|
_PyObject_GC_TRACK(op);
|
|
return (PyObject *) op;
|
|
}
|
|
|
|
PyObject *
|
|
PyMethod_Function(PyObject *im)
|
|
{
|
|
if (!PyMethod_Check(im)) {
|
|
PyErr_BadInternalCall();
|
|
return NULL;
|
|
}
|
|
return ((PyMethodObject *)im)->im_func;
|
|
}
|
|
|
|
PyObject *
|
|
PyMethod_Self(PyObject *im)
|
|
{
|
|
if (!PyMethod_Check(im)) {
|
|
PyErr_BadInternalCall();
|
|
return NULL;
|
|
}
|
|
return ((PyMethodObject *)im)->im_self;
|
|
}
|
|
|
|
PyObject *
|
|
PyMethod_Class(PyObject *im)
|
|
{
|
|
if (!PyMethod_Check(im)) {
|
|
PyErr_BadInternalCall();
|
|
return NULL;
|
|
}
|
|
return ((PyMethodObject *)im)->im_class;
|
|
}
|
|
|
|
PyDoc_STRVAR(class_doc,
|
|
"classobj(name, bases, dict)\n\
|
|
\n\
|
|
Create a class object. The name must be a string; the second argument\n\
|
|
a tuple of classes, and the third a dictionary.");
|
|
|
|
static PyObject *
|
|
class_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|
{
|
|
PyObject *name, *bases, *dict;
|
|
static char *kwlist[] = {"name", "bases", "dict", 0};
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "SOO", kwlist,
|
|
&name, &bases, &dict))
|
|
return NULL;
|
|
return PyClass_New(bases, dict, name);
|
|
}
|
|
|
|
/* Class methods */
|
|
|
|
static void
|
|
class_dealloc(PyClassObject *op)
|
|
{
|
|
_PyObject_GC_UNTRACK(op);
|
|
Py_DECREF(op->cl_bases);
|
|
Py_DECREF(op->cl_dict);
|
|
Py_XDECREF(op->cl_name);
|
|
Py_XDECREF(op->cl_getattr);
|
|
Py_XDECREF(op->cl_setattr);
|
|
Py_XDECREF(op->cl_delattr);
|
|
PyObject_GC_Del(op);
|
|
}
|
|
|
|
static PyObject *
|
|
class_lookup(PyClassObject *cp, PyObject *name, PyClassObject **pclass)
|
|
{
|
|
Py_ssize_t i, n;
|
|
PyObject *value = PyDict_GetItem(cp->cl_dict, name);
|
|
if (value != NULL) {
|
|
*pclass = cp;
|
|
return value;
|
|
}
|
|
n = PyTuple_Size(cp->cl_bases);
|
|
for (i = 0; i < n; i++) {
|
|
/* XXX What if one of the bases is not a class? */
|
|
PyObject *v = class_lookup(
|
|
(PyClassObject *)
|
|
PyTuple_GetItem(cp->cl_bases, i), name, pclass);
|
|
if (v != NULL)
|
|
return v;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
static PyObject *
|
|
class_getattr(register PyClassObject *op, PyObject *name)
|
|
{
|
|
register PyObject *v;
|
|
register char *sname = PyString_AsString(name);
|
|
PyClassObject *klass;
|
|
descrgetfunc f;
|
|
|
|
if (sname[0] == '_' && sname[1] == '_') {
|
|
if (strcmp(sname, "__dict__") == 0) {
|
|
if (PyEval_GetRestricted()) {
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
"class.__dict__ not accessible in restricted mode");
|
|
return NULL;
|
|
}
|
|
Py_INCREF(op->cl_dict);
|
|
return op->cl_dict;
|
|
}
|
|
if (strcmp(sname, "__bases__") == 0) {
|
|
Py_INCREF(op->cl_bases);
|
|
return op->cl_bases;
|
|
}
|
|
if (strcmp(sname, "__name__") == 0) {
|
|
if (op->cl_name == NULL)
|
|
v = Py_None;
|
|
else
|
|
v = op->cl_name;
|
|
Py_INCREF(v);
|
|
return v;
|
|
}
|
|
}
|
|
v = class_lookup(op, name, &klass);
|
|
if (v == NULL) {
|
|
PyErr_Format(PyExc_AttributeError,
|
|
"class %.50s has no attribute '%.400s'",
|
|
PyString_AS_STRING(op->cl_name), sname);
|
|
return NULL;
|
|
}
|
|
f = TP_DESCR_GET(v->ob_type);
|
|
if (f == NULL)
|
|
Py_INCREF(v);
|
|
else
|
|
v = f(v, (PyObject *)NULL, (PyObject *)op);
|
|
return v;
|
|
}
|
|
|
|
static void
|
|
set_slot(PyObject **slot, PyObject *v)
|
|
{
|
|
PyObject *temp = *slot;
|
|
Py_XINCREF(v);
|
|
*slot = v;
|
|
Py_XDECREF(temp);
|
|
}
|
|
|
|
static void
|
|
set_attr_slots(PyClassObject *c)
|
|
{
|
|
PyClassObject *dummy;
|
|
|
|
set_slot(&c->cl_getattr, class_lookup(c, getattrstr, &dummy));
|
|
set_slot(&c->cl_setattr, class_lookup(c, setattrstr, &dummy));
|
|
set_slot(&c->cl_delattr, class_lookup(c, delattrstr, &dummy));
|
|
}
|
|
|
|
static char *
|
|
set_dict(PyClassObject *c, PyObject *v)
|
|
{
|
|
if (v == NULL || !PyDict_Check(v))
|
|
return "__dict__ must be a dictionary object";
|
|
set_slot(&c->cl_dict, v);
|
|
set_attr_slots(c);
|
|
return "";
|
|
}
|
|
|
|
static char *
|
|
set_bases(PyClassObject *c, PyObject *v)
|
|
{
|
|
Py_ssize_t i, n;
|
|
|
|
if (v == NULL || !PyTuple_Check(v))
|
|
return "__bases__ must be a tuple object";
|
|
n = PyTuple_Size(v);
|
|
for (i = 0; i < n; i++) {
|
|
PyObject *x = PyTuple_GET_ITEM(v, i);
|
|
if (!PyClass_Check(x))
|
|
return "__bases__ items must be classes";
|
|
if (PyClass_IsSubclass(x, (PyObject *)c))
|
|
return "a __bases__ item causes an inheritance cycle";
|
|
}
|
|
set_slot(&c->cl_bases, v);
|
|
set_attr_slots(c);
|
|
return "";
|
|
}
|
|
|
|
static char *
|
|
set_name(PyClassObject *c, PyObject *v)
|
|
{
|
|
if (v == NULL || !PyString_Check(v))
|
|
return "__name__ must be a string object";
|
|
if (strlen(PyString_AS_STRING(v)) != (size_t)PyString_GET_SIZE(v))
|
|
return "__name__ must not contain null bytes";
|
|
set_slot(&c->cl_name, v);
|
|
return "";
|
|
}
|
|
|
|
static int
|
|
class_setattr(PyClassObject *op, PyObject *name, PyObject *v)
|
|
{
|
|
char *sname;
|
|
if (PyEval_GetRestricted()) {
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
"classes are read-only in restricted mode");
|
|
return -1;
|
|
}
|
|
sname = PyString_AsString(name);
|
|
if (sname[0] == '_' && sname[1] == '_') {
|
|
Py_ssize_t n = PyString_Size(name);
|
|
if (sname[n-1] == '_' && sname[n-2] == '_') {
|
|
char *err = NULL;
|
|
if (strcmp(sname, "__dict__") == 0)
|
|
err = set_dict(op, v);
|
|
else if (strcmp(sname, "__bases__") == 0)
|
|
err = set_bases(op, v);
|
|
else if (strcmp(sname, "__name__") == 0)
|
|
err = set_name(op, v);
|
|
else if (strcmp(sname, "__getattr__") == 0)
|
|
set_slot(&op->cl_getattr, v);
|
|
else if (strcmp(sname, "__setattr__") == 0)
|
|
set_slot(&op->cl_setattr, v);
|
|
else if (strcmp(sname, "__delattr__") == 0)
|
|
set_slot(&op->cl_delattr, v);
|
|
/* For the last three, we fall through to update the
|
|
dictionary as well. */
|
|
if (err != NULL) {
|
|
if (*err == '\0')
|
|
return 0;
|
|
PyErr_SetString(PyExc_TypeError, err);
|
|
return -1;
|
|
}
|
|
}
|
|
}
|
|
if (v == NULL) {
|
|
int rv = PyDict_DelItem(op->cl_dict, name);
|
|
if (rv < 0)
|
|
PyErr_Format(PyExc_AttributeError,
|
|
"class %.50s has no attribute '%.400s'",
|
|
PyString_AS_STRING(op->cl_name), sname);
|
|
return rv;
|
|
}
|
|
else
|
|
return PyDict_SetItem(op->cl_dict, name, v);
|
|
}
|
|
|
|
static PyObject *
|
|
class_repr(PyClassObject *op)
|
|
{
|
|
PyObject *mod = PyDict_GetItemString(op->cl_dict, "__module__");
|
|
char *name;
|
|
if (op->cl_name == NULL || !PyString_Check(op->cl_name))
|
|
name = "?";
|
|
else
|
|
name = PyString_AsString(op->cl_name);
|
|
if (mod == NULL || !PyString_Check(mod))
|
|
return PyString_FromFormat("<class ?.%s at %p>", name, op);
|
|
else
|
|
return PyString_FromFormat("<class %s.%s at %p>",
|
|
PyString_AsString(mod),
|
|
name, op);
|
|
}
|
|
|
|
static PyObject *
|
|
class_str(PyClassObject *op)
|
|
{
|
|
PyObject *mod = PyDict_GetItemString(op->cl_dict, "__module__");
|
|
PyObject *name = op->cl_name;
|
|
PyObject *res;
|
|
Py_ssize_t m, n;
|
|
|
|
if (name == NULL || !PyString_Check(name))
|
|
return class_repr(op);
|
|
if (mod == NULL || !PyString_Check(mod)) {
|
|
Py_INCREF(name);
|
|
return name;
|
|
}
|
|
m = PyString_GET_SIZE(mod);
|
|
n = PyString_GET_SIZE(name);
|
|
res = PyString_FromStringAndSize((char *)NULL, m+1+n);
|
|
if (res != NULL) {
|
|
char *s = PyString_AS_STRING(res);
|
|
memcpy(s, PyString_AS_STRING(mod), m);
|
|
s += m;
|
|
*s++ = '.';
|
|
memcpy(s, PyString_AS_STRING(name), n);
|
|
}
|
|
return res;
|
|
}
|
|
|
|
static int
|
|
class_traverse(PyClassObject *o, visitproc visit, void *arg)
|
|
{
|
|
Py_VISIT(o->cl_bases);
|
|
Py_VISIT(o->cl_dict);
|
|
Py_VISIT(o->cl_name);
|
|
Py_VISIT(o->cl_getattr);
|
|
Py_VISIT(o->cl_setattr);
|
|
Py_VISIT(o->cl_delattr);
|
|
return 0;
|
|
}
|
|
|
|
PyTypeObject PyClass_Type = {
|
|
PyObject_HEAD_INIT(&PyType_Type)
|
|
0,
|
|
"classobj",
|
|
sizeof(PyClassObject),
|
|
0,
|
|
(destructor)class_dealloc, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
(reprfunc)class_repr, /* tp_repr */
|
|
0, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
0, /* tp_hash */
|
|
PyInstance_New, /* tp_call */
|
|
(reprfunc)class_str, /* tp_str */
|
|
(getattrofunc)class_getattr, /* tp_getattro */
|
|
(setattrofunc)class_setattr, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */
|
|
class_doc, /* tp_doc */
|
|
(traverseproc)class_traverse, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
0, /* tp_iter */
|
|
0, /* tp_iternext */
|
|
0, /* tp_methods */
|
|
0, /* tp_members */
|
|
0, /* tp_getset */
|
|
0, /* tp_base */
|
|
0, /* tp_dict */
|
|
0, /* tp_descr_get */
|
|
0, /* tp_descr_set */
|
|
0, /* tp_dictoffset */
|
|
0, /* tp_init */
|
|
0, /* tp_alloc */
|
|
class_new, /* tp_new */
|
|
};
|
|
|
|
int
|
|
PyClass_IsSubclass(PyObject *klass, PyObject *base)
|
|
{
|
|
Py_ssize_t i, n;
|
|
PyClassObject *cp;
|
|
if (klass == base)
|
|
return 1;
|
|
if (PyTuple_Check(base)) {
|
|
n = PyTuple_GET_SIZE(base);
|
|
for (i = 0; i < n; i++) {
|
|
if (PyClass_IsSubclass(klass, PyTuple_GET_ITEM(base, i)))
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
if (klass == NULL || !PyClass_Check(klass))
|
|
return 0;
|
|
cp = (PyClassObject *)klass;
|
|
n = PyTuple_Size(cp->cl_bases);
|
|
for (i = 0; i < n; i++) {
|
|
if (PyClass_IsSubclass(PyTuple_GetItem(cp->cl_bases, i), base))
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* Instance objects */
|
|
|
|
PyObject *
|
|
PyInstance_NewRaw(PyObject *klass, PyObject *dict)
|
|
{
|
|
PyInstanceObject *inst;
|
|
|
|
if (!PyClass_Check(klass)) {
|
|
PyErr_BadInternalCall();
|
|
return NULL;
|
|
}
|
|
if (dict == NULL) {
|
|
dict = PyDict_New();
|
|
if (dict == NULL)
|
|
return NULL;
|
|
}
|
|
else {
|
|
if (!PyDict_Check(dict)) {
|
|
PyErr_BadInternalCall();
|
|
return NULL;
|
|
}
|
|
Py_INCREF(dict);
|
|
}
|
|
inst = PyObject_GC_New(PyInstanceObject, &PyInstance_Type);
|
|
if (inst == NULL) {
|
|
Py_DECREF(dict);
|
|
return NULL;
|
|
}
|
|
inst->in_weakreflist = NULL;
|
|
Py_INCREF(klass);
|
|
inst->in_class = (PyClassObject *)klass;
|
|
inst->in_dict = dict;
|
|
_PyObject_GC_TRACK(inst);
|
|
return (PyObject *)inst;
|
|
}
|
|
|
|
PyObject *
|
|
PyInstance_New(PyObject *klass, PyObject *arg, PyObject *kw)
|
|
{
|
|
register PyInstanceObject *inst;
|
|
PyObject *init;
|
|
static PyObject *initstr;
|
|
|
|
inst = (PyInstanceObject *) PyInstance_NewRaw(klass, NULL);
|
|
if (inst == NULL)
|
|
return NULL;
|
|
if (initstr == NULL)
|
|
initstr = PyString_InternFromString("__init__");
|
|
init = instance_getattr2(inst, initstr);
|
|
if (init == NULL) {
|
|
if (PyErr_Occurred()) {
|
|
Py_DECREF(inst);
|
|
return NULL;
|
|
}
|
|
if ((arg != NULL && (!PyTuple_Check(arg) ||
|
|
PyTuple_Size(arg) != 0))
|
|
|| (kw != NULL && (!PyDict_Check(kw) ||
|
|
PyDict_Size(kw) != 0))) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"this constructor takes no arguments");
|
|
Py_DECREF(inst);
|
|
inst = NULL;
|
|
}
|
|
}
|
|
else {
|
|
PyObject *res = PyEval_CallObjectWithKeywords(init, arg, kw);
|
|
Py_DECREF(init);
|
|
if (res == NULL) {
|
|
Py_DECREF(inst);
|
|
inst = NULL;
|
|
}
|
|
else {
|
|
if (res != Py_None) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"__init__() should return None");
|
|
Py_DECREF(inst);
|
|
inst = NULL;
|
|
}
|
|
Py_DECREF(res);
|
|
}
|
|
}
|
|
return (PyObject *)inst;
|
|
}
|
|
|
|
/* Instance methods */
|
|
|
|
PyDoc_STRVAR(instance_doc,
|
|
"instance(class[, dict])\n\
|
|
\n\
|
|
Create an instance without calling its __init__() method.\n\
|
|
The class must be a classic class.\n\
|
|
If present, dict must be a dictionary or None.");
|
|
|
|
static PyObject *
|
|
instance_new(PyTypeObject* type, PyObject* args, PyObject *kw)
|
|
{
|
|
PyObject *klass;
|
|
PyObject *dict = Py_None;
|
|
|
|
if (!PyArg_ParseTuple(args, "O!|O:instance",
|
|
&PyClass_Type, &klass, &dict))
|
|
return NULL;
|
|
|
|
if (dict == Py_None)
|
|
dict = NULL;
|
|
else if (!PyDict_Check(dict)) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"instance() second arg must be dictionary or None");
|
|
return NULL;
|
|
}
|
|
return PyInstance_NewRaw(klass, dict);
|
|
}
|
|
|
|
|
|
static void
|
|
instance_dealloc(register PyInstanceObject *inst)
|
|
{
|
|
PyObject *error_type, *error_value, *error_traceback;
|
|
PyObject *del;
|
|
static PyObject *delstr;
|
|
|
|
_PyObject_GC_UNTRACK(inst);
|
|
if (inst->in_weakreflist != NULL)
|
|
PyObject_ClearWeakRefs((PyObject *) inst);
|
|
|
|
/* Temporarily resurrect the object. */
|
|
assert(inst->ob_type == &PyInstance_Type);
|
|
assert(inst->ob_refcnt == 0);
|
|
inst->ob_refcnt = 1;
|
|
|
|
/* Save the current exception, if any. */
|
|
PyErr_Fetch(&error_type, &error_value, &error_traceback);
|
|
/* Execute __del__ method, if any. */
|
|
if (delstr == NULL)
|
|
delstr = PyString_InternFromString("__del__");
|
|
if ((del = instance_getattr2(inst, delstr)) != NULL) {
|
|
PyObject *res = PyEval_CallObject(del, (PyObject *)NULL);
|
|
if (res == NULL)
|
|
PyErr_WriteUnraisable(del);
|
|
else
|
|
Py_DECREF(res);
|
|
Py_DECREF(del);
|
|
}
|
|
/* Restore the saved exception. */
|
|
PyErr_Restore(error_type, error_value, error_traceback);
|
|
|
|
/* Undo the temporary resurrection; can't use DECREF here, it would
|
|
* cause a recursive call.
|
|
*/
|
|
assert(inst->ob_refcnt > 0);
|
|
if (--inst->ob_refcnt == 0) {
|
|
Py_DECREF(inst->in_class);
|
|
Py_XDECREF(inst->in_dict);
|
|
PyObject_GC_Del(inst);
|
|
}
|
|
else {
|
|
Py_ssize_t refcnt = inst->ob_refcnt;
|
|
/* __del__ resurrected it! Make it look like the original
|
|
* Py_DECREF never happened.
|
|
*/
|
|
_Py_NewReference((PyObject *)inst);
|
|
inst->ob_refcnt = refcnt;
|
|
_PyObject_GC_TRACK(inst);
|
|
/* If Py_REF_DEBUG, _Py_NewReference bumped _Py_RefTotal, so
|
|
* we need to undo that. */
|
|
_Py_DEC_REFTOTAL;
|
|
/* If Py_TRACE_REFS, _Py_NewReference re-added self to the
|
|
* object chain, so no more to do there.
|
|
* If COUNT_ALLOCS, the original decref bumped tp_frees, and
|
|
* _Py_NewReference bumped tp_allocs: both of those need to be
|
|
* undone.
|
|
*/
|
|
#ifdef COUNT_ALLOCS
|
|
--inst->ob_type->tp_frees;
|
|
--inst->ob_type->tp_allocs;
|
|
#endif
|
|
}
|
|
}
|
|
|
|
static PyObject *
|
|
instance_getattr1(register PyInstanceObject *inst, PyObject *name)
|
|
{
|
|
register PyObject *v;
|
|
register char *sname = PyString_AsString(name);
|
|
if (sname[0] == '_' && sname[1] == '_') {
|
|
if (strcmp(sname, "__dict__") == 0) {
|
|
if (PyEval_GetRestricted()) {
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
"instance.__dict__ not accessible in restricted mode");
|
|
return NULL;
|
|
}
|
|
Py_INCREF(inst->in_dict);
|
|
return inst->in_dict;
|
|
}
|
|
if (strcmp(sname, "__class__") == 0) {
|
|
Py_INCREF(inst->in_class);
|
|
return (PyObject *)inst->in_class;
|
|
}
|
|
}
|
|
v = instance_getattr2(inst, name);
|
|
if (v == NULL && !PyErr_Occurred()) {
|
|
PyErr_Format(PyExc_AttributeError,
|
|
"%.50s instance has no attribute '%.400s'",
|
|
PyString_AS_STRING(inst->in_class->cl_name), sname);
|
|
}
|
|
return v;
|
|
}
|
|
|
|
static PyObject *
|
|
instance_getattr2(register PyInstanceObject *inst, PyObject *name)
|
|
{
|
|
register PyObject *v;
|
|
PyClassObject *klass;
|
|
descrgetfunc f;
|
|
|
|
v = PyDict_GetItem(inst->in_dict, name);
|
|
if (v != NULL) {
|
|
Py_INCREF(v);
|
|
return v;
|
|
}
|
|
v = class_lookup(inst->in_class, name, &klass);
|
|
if (v != NULL) {
|
|
Py_INCREF(v);
|
|
f = TP_DESCR_GET(v->ob_type);
|
|
if (f != NULL) {
|
|
PyObject *w = f(v, (PyObject *)inst,
|
|
(PyObject *)(inst->in_class));
|
|
Py_DECREF(v);
|
|
v = w;
|
|
}
|
|
}
|
|
return v;
|
|
}
|
|
|
|
static PyObject *
|
|
instance_getattr(register PyInstanceObject *inst, PyObject *name)
|
|
{
|
|
register PyObject *func, *res;
|
|
res = instance_getattr1(inst, name);
|
|
if (res == NULL && (func = inst->in_class->cl_getattr) != NULL) {
|
|
PyObject *args;
|
|
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
|
|
return NULL;
|
|
PyErr_Clear();
|
|
args = PyTuple_Pack(2, inst, name);
|
|
if (args == NULL)
|
|
return NULL;
|
|
res = PyEval_CallObject(func, args);
|
|
Py_DECREF(args);
|
|
}
|
|
return res;
|
|
}
|
|
|
|
/* See classobject.h comments: this only does dict lookups, and is always
|
|
* safe to call.
|
|
*/
|
|
PyObject *
|
|
_PyInstance_Lookup(PyObject *pinst, PyObject *name)
|
|
{
|
|
PyObject *v;
|
|
PyClassObject *klass;
|
|
PyInstanceObject *inst; /* pinst cast to the right type */
|
|
|
|
assert(PyInstance_Check(pinst));
|
|
inst = (PyInstanceObject *)pinst;
|
|
|
|
assert(PyString_Check(name));
|
|
|
|
v = PyDict_GetItem(inst->in_dict, name);
|
|
if (v == NULL)
|
|
v = class_lookup(inst->in_class, name, &klass);
|
|
return v;
|
|
}
|
|
|
|
static int
|
|
instance_setattr1(PyInstanceObject *inst, PyObject *name, PyObject *v)
|
|
{
|
|
if (v == NULL) {
|
|
int rv = PyDict_DelItem(inst->in_dict, name);
|
|
if (rv < 0)
|
|
PyErr_Format(PyExc_AttributeError,
|
|
"%.50s instance has no attribute '%.400s'",
|
|
PyString_AS_STRING(inst->in_class->cl_name),
|
|
PyString_AS_STRING(name));
|
|
return rv;
|
|
}
|
|
else
|
|
return PyDict_SetItem(inst->in_dict, name, v);
|
|
}
|
|
|
|
static int
|
|
instance_setattr(PyInstanceObject *inst, PyObject *name, PyObject *v)
|
|
{
|
|
PyObject *func, *args, *res, *tmp;
|
|
char *sname = PyString_AsString(name);
|
|
if (sname[0] == '_' && sname[1] == '_') {
|
|
Py_ssize_t n = PyString_Size(name);
|
|
if (sname[n-1] == '_' && sname[n-2] == '_') {
|
|
if (strcmp(sname, "__dict__") == 0) {
|
|
if (PyEval_GetRestricted()) {
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
"__dict__ not accessible in restricted mode");
|
|
return -1;
|
|
}
|
|
if (v == NULL || !PyDict_Check(v)) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"__dict__ must be set to a dictionary");
|
|
return -1;
|
|
}
|
|
tmp = inst->in_dict;
|
|
Py_INCREF(v);
|
|
inst->in_dict = v;
|
|
Py_DECREF(tmp);
|
|
return 0;
|
|
}
|
|
if (strcmp(sname, "__class__") == 0) {
|
|
if (PyEval_GetRestricted()) {
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
"__class__ not accessible in restricted mode");
|
|
return -1;
|
|
}
|
|
if (v == NULL || !PyClass_Check(v)) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"__class__ must be set to a class");
|
|
return -1;
|
|
}
|
|
tmp = (PyObject *)(inst->in_class);
|
|
Py_INCREF(v);
|
|
inst->in_class = (PyClassObject *)v;
|
|
Py_DECREF(tmp);
|
|
return 0;
|
|
}
|
|
}
|
|
}
|
|
if (v == NULL)
|
|
func = inst->in_class->cl_delattr;
|
|
else
|
|
func = inst->in_class->cl_setattr;
|
|
if (func == NULL)
|
|
return instance_setattr1(inst, name, v);
|
|
if (v == NULL)
|
|
args = PyTuple_Pack(2, inst, name);
|
|
else
|
|
args = PyTuple_Pack(3, inst, name, v);
|
|
if (args == NULL)
|
|
return -1;
|
|
res = PyEval_CallObject(func, args);
|
|
Py_DECREF(args);
|
|
if (res == NULL)
|
|
return -1;
|
|
Py_DECREF(res);
|
|
return 0;
|
|
}
|
|
|
|
static PyObject *
|
|
instance_repr(PyInstanceObject *inst)
|
|
{
|
|
PyObject *func;
|
|
PyObject *res;
|
|
static PyObject *reprstr;
|
|
|
|
if (reprstr == NULL)
|
|
reprstr = PyString_InternFromString("__repr__");
|
|
func = instance_getattr(inst, reprstr);
|
|
if (func == NULL) {
|
|
PyObject *classname, *mod;
|
|
char *cname;
|
|
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
|
|
return NULL;
|
|
PyErr_Clear();
|
|
classname = inst->in_class->cl_name;
|
|
mod = PyDict_GetItemString(inst->in_class->cl_dict,
|
|
"__module__");
|
|
if (classname != NULL && PyString_Check(classname))
|
|
cname = PyString_AsString(classname);
|
|
else
|
|
cname = "?";
|
|
if (mod == NULL || !PyString_Check(mod))
|
|
return PyString_FromFormat("<?.%s instance at %p>",
|
|
cname, inst);
|
|
else
|
|
return PyString_FromFormat("<%s.%s instance at %p>",
|
|
PyString_AsString(mod),
|
|
cname, inst);
|
|
}
|
|
res = PyEval_CallObject(func, (PyObject *)NULL);
|
|
Py_DECREF(func);
|
|
return res;
|
|
}
|
|
|
|
static PyObject *
|
|
instance_str(PyInstanceObject *inst)
|
|
{
|
|
PyObject *func;
|
|
PyObject *res;
|
|
static PyObject *strstr;
|
|
|
|
if (strstr == NULL)
|
|
strstr = PyString_InternFromString("__str__");
|
|
func = instance_getattr(inst, strstr);
|
|
if (func == NULL) {
|
|
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
|
|
return NULL;
|
|
PyErr_Clear();
|
|
return instance_repr(inst);
|
|
}
|
|
res = PyEval_CallObject(func, (PyObject *)NULL);
|
|
Py_DECREF(func);
|
|
return res;
|
|
}
|
|
|
|
static long
|
|
instance_hash(PyInstanceObject *inst)
|
|
{
|
|
PyObject *func;
|
|
PyObject *res;
|
|
long outcome;
|
|
static PyObject *hashstr, *eqstr, *cmpstr;
|
|
|
|
if (hashstr == NULL)
|
|
hashstr = PyString_InternFromString("__hash__");
|
|
func = instance_getattr(inst, hashstr);
|
|
if (func == NULL) {
|
|
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
|
|
return -1;
|
|
PyErr_Clear();
|
|
/* If there is no __eq__ and no __cmp__ method, we hash on the
|
|
address. If an __eq__ or __cmp__ method exists, there must
|
|
be a __hash__. */
|
|
if (eqstr == NULL)
|
|
eqstr = PyString_InternFromString("__eq__");
|
|
func = instance_getattr(inst, eqstr);
|
|
if (func == NULL) {
|
|
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
|
|
return -1;
|
|
PyErr_Clear();
|
|
if (cmpstr == NULL)
|
|
cmpstr = PyString_InternFromString("__cmp__");
|
|
func = instance_getattr(inst, cmpstr);
|
|
if (func == NULL) {
|
|
if (!PyErr_ExceptionMatches(
|
|
PyExc_AttributeError))
|
|
return -1;
|
|
PyErr_Clear();
|
|
return _Py_HashPointer(inst);
|
|
}
|
|
}
|
|
Py_XDECREF(func);
|
|
PyErr_SetString(PyExc_TypeError, "unhashable instance");
|
|
return -1;
|
|
}
|
|
res = PyEval_CallObject(func, (PyObject *)NULL);
|
|
Py_DECREF(func);
|
|
if (res == NULL)
|
|
return -1;
|
|
if (PyInt_Check(res)) {
|
|
outcome = PyInt_AsLong(res);
|
|
if (outcome == -1)
|
|
outcome = -2;
|
|
}
|
|
else {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"__hash__() should return an int");
|
|
outcome = -1;
|
|
}
|
|
Py_DECREF(res);
|
|
return outcome;
|
|
}
|
|
|
|
static int
|
|
instance_traverse(PyInstanceObject *o, visitproc visit, void *arg)
|
|
{
|
|
Py_VISIT(o->in_class);
|
|
Py_VISIT(o->in_dict);
|
|
return 0;
|
|
}
|
|
|
|
static PyObject *getitemstr, *setitemstr, *delitemstr, *lenstr;
|
|
static PyObject *iterstr, *nextstr;
|
|
|
|
static Py_ssize_t
|
|
instance_length(PyInstanceObject *inst)
|
|
{
|
|
PyObject *func;
|
|
PyObject *res;
|
|
Py_ssize_t outcome;
|
|
|
|
if (lenstr == NULL)
|
|
lenstr = PyString_InternFromString("__len__");
|
|
func = instance_getattr(inst, lenstr);
|
|
if (func == NULL)
|
|
return -1;
|
|
res = PyEval_CallObject(func, (PyObject *)NULL);
|
|
Py_DECREF(func);
|
|
if (res == NULL)
|
|
return -1;
|
|
if (PyInt_Check(res)) {
|
|
Py_ssize_t temp = PyInt_AsSsize_t(res);
|
|
if (temp == -1 && PyErr_Occurred()) {
|
|
Py_DECREF(res);
|
|
return -1;
|
|
}
|
|
outcome = (Py_ssize_t)temp;
|
|
#if SIZEOF_SIZE_T < SIZEOF_LONG
|
|
/* Overflow check -- range of PyInt is more than C int */
|
|
if (outcome != temp) {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"__len__() should return 0 <= outcome < 2**31");
|
|
outcome = -1;
|
|
}
|
|
else
|
|
#endif
|
|
if (outcome < 0)
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"__len__() should return >= 0");
|
|
}
|
|
else {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"__len__() should return an int");
|
|
outcome = -1;
|
|
}
|
|
Py_DECREF(res);
|
|
return outcome;
|
|
}
|
|
|
|
static PyObject *
|
|
instance_subscript(PyInstanceObject *inst, PyObject *key)
|
|
{
|
|
PyObject *func;
|
|
PyObject *arg;
|
|
PyObject *res;
|
|
|
|
if (getitemstr == NULL)
|
|
getitemstr = PyString_InternFromString("__getitem__");
|
|
func = instance_getattr(inst, getitemstr);
|
|
if (func == NULL)
|
|
return NULL;
|
|
arg = PyTuple_Pack(1, key);
|
|
if (arg == NULL) {
|
|
Py_DECREF(func);
|
|
return NULL;
|
|
}
|
|
res = PyEval_CallObject(func, arg);
|
|
Py_DECREF(func);
|
|
Py_DECREF(arg);
|
|
return res;
|
|
}
|
|
|
|
static int
|
|
instance_ass_subscript(PyInstanceObject *inst, PyObject *key, PyObject *value)
|
|
{
|
|
PyObject *func;
|
|
PyObject *arg;
|
|
PyObject *res;
|
|
|
|
if (value == NULL) {
|
|
if (delitemstr == NULL)
|
|
delitemstr = PyString_InternFromString("__delitem__");
|
|
func = instance_getattr(inst, delitemstr);
|
|
}
|
|
else {
|
|
if (setitemstr == NULL)
|
|
setitemstr = PyString_InternFromString("__setitem__");
|
|
func = instance_getattr(inst, setitemstr);
|
|
}
|
|
if (func == NULL)
|
|
return -1;
|
|
if (value == NULL)
|
|
arg = PyTuple_Pack(1, key);
|
|
else
|
|
arg = PyTuple_Pack(2, key, value);
|
|
if (arg == NULL) {
|
|
Py_DECREF(func);
|
|
return -1;
|
|
}
|
|
res = PyEval_CallObject(func, arg);
|
|
Py_DECREF(func);
|
|
Py_DECREF(arg);
|
|
if (res == NULL)
|
|
return -1;
|
|
Py_DECREF(res);
|
|
return 0;
|
|
}
|
|
|
|
static PyMappingMethods instance_as_mapping = {
|
|
(lenfunc)instance_length, /* mp_length */
|
|
(binaryfunc)instance_subscript, /* mp_subscript */
|
|
(objobjargproc)instance_ass_subscript, /* mp_ass_subscript */
|
|
};
|
|
|
|
static PyObject *
|
|
instance_item(PyInstanceObject *inst, Py_ssize_t i)
|
|
{
|
|
PyObject *func, *res;
|
|
|
|
if (getitemstr == NULL)
|
|
getitemstr = PyString_InternFromString("__getitem__");
|
|
func = instance_getattr(inst, getitemstr);
|
|
if (func == NULL)
|
|
return NULL;
|
|
res = PyObject_CallFunction(func, "n", i);
|
|
Py_DECREF(func);
|
|
return res;
|
|
}
|
|
|
|
static PyObject *
|
|
instance_slice(PyInstanceObject *inst, Py_ssize_t i, Py_ssize_t j)
|
|
{
|
|
PyObject *func, *arg, *res;
|
|
static PyObject *getslicestr;
|
|
|
|
if (getslicestr == NULL)
|
|
getslicestr = PyString_InternFromString("__getslice__");
|
|
func = instance_getattr(inst, getslicestr);
|
|
|
|
if (func == NULL) {
|
|
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
|
|
return NULL;
|
|
PyErr_Clear();
|
|
|
|
if (getitemstr == NULL)
|
|
getitemstr = PyString_InternFromString("__getitem__");
|
|
func = instance_getattr(inst, getitemstr);
|
|
if (func == NULL)
|
|
return NULL;
|
|
arg = Py_BuildValue("(N)", _PySlice_FromIndices(i, j));
|
|
} else
|
|
arg = Py_BuildValue("(nn)", i, j);
|
|
|
|
if (arg == NULL) {
|
|
Py_DECREF(func);
|
|
return NULL;
|
|
}
|
|
res = PyEval_CallObject(func, arg);
|
|
Py_DECREF(func);
|
|
Py_DECREF(arg);
|
|
return res;
|
|
}
|
|
|
|
static int
|
|
instance_ass_item(PyInstanceObject *inst, Py_ssize_t i, PyObject *item)
|
|
{
|
|
PyObject *func, *arg, *res;
|
|
|
|
if (item == NULL) {
|
|
if (delitemstr == NULL)
|
|
delitemstr = PyString_InternFromString("__delitem__");
|
|
func = instance_getattr(inst, delitemstr);
|
|
}
|
|
else {
|
|
if (setitemstr == NULL)
|
|
setitemstr = PyString_InternFromString("__setitem__");
|
|
func = instance_getattr(inst, setitemstr);
|
|
}
|
|
if (func == NULL)
|
|
return -1;
|
|
if (item == NULL)
|
|
arg = PyInt_FromSsize_t(i);
|
|
else
|
|
arg = Py_BuildValue("(nO)", i, item);
|
|
if (arg == NULL) {
|
|
Py_DECREF(func);
|
|
return -1;
|
|
}
|
|
res = PyEval_CallObject(func, arg);
|
|
Py_DECREF(func);
|
|
Py_DECREF(arg);
|
|
if (res == NULL)
|
|
return -1;
|
|
Py_DECREF(res);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
instance_ass_slice(PyInstanceObject *inst, Py_ssize_t i, Py_ssize_t j, PyObject *value)
|
|
{
|
|
PyObject *func, *arg, *res;
|
|
static PyObject *setslicestr, *delslicestr;
|
|
|
|
if (value == NULL) {
|
|
if (delslicestr == NULL)
|
|
delslicestr =
|
|
PyString_InternFromString("__delslice__");
|
|
func = instance_getattr(inst, delslicestr);
|
|
if (func == NULL) {
|
|
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
|
|
return -1;
|
|
PyErr_Clear();
|
|
if (delitemstr == NULL)
|
|
delitemstr =
|
|
PyString_InternFromString("__delitem__");
|
|
func = instance_getattr(inst, delitemstr);
|
|
if (func == NULL)
|
|
return -1;
|
|
|
|
arg = Py_BuildValue("(N)",
|
|
_PySlice_FromIndices(i, j));
|
|
} else
|
|
arg = Py_BuildValue("(nn)", i, j);
|
|
}
|
|
else {
|
|
if (setslicestr == NULL)
|
|
setslicestr =
|
|
PyString_InternFromString("__setslice__");
|
|
func = instance_getattr(inst, setslicestr);
|
|
if (func == NULL) {
|
|
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
|
|
return -1;
|
|
PyErr_Clear();
|
|
if (setitemstr == NULL)
|
|
setitemstr =
|
|
PyString_InternFromString("__setitem__");
|
|
func = instance_getattr(inst, setitemstr);
|
|
if (func == NULL)
|
|
return -1;
|
|
|
|
arg = Py_BuildValue("(NO)",
|
|
_PySlice_FromIndices(i, j), value);
|
|
} else
|
|
arg = Py_BuildValue("(nnO)", i, j, value);
|
|
}
|
|
if (arg == NULL) {
|
|
Py_DECREF(func);
|
|
return -1;
|
|
}
|
|
res = PyEval_CallObject(func, arg);
|
|
Py_DECREF(func);
|
|
Py_DECREF(arg);
|
|
if (res == NULL)
|
|
return -1;
|
|
Py_DECREF(res);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
instance_contains(PyInstanceObject *inst, PyObject *member)
|
|
{
|
|
static PyObject *__contains__;
|
|
PyObject *func;
|
|
|
|
/* Try __contains__ first.
|
|
* If that can't be done, try iterator-based searching.
|
|
*/
|
|
|
|
if(__contains__ == NULL) {
|
|
__contains__ = PyString_InternFromString("__contains__");
|
|
if(__contains__ == NULL)
|
|
return -1;
|
|
}
|
|
func = instance_getattr(inst, __contains__);
|
|
if (func) {
|
|
PyObject *res;
|
|
int ret;
|
|
PyObject *arg = PyTuple_Pack(1, member);
|
|
if(arg == NULL) {
|
|
Py_DECREF(func);
|
|
return -1;
|
|
}
|
|
res = PyEval_CallObject(func, arg);
|
|
Py_DECREF(func);
|
|
Py_DECREF(arg);
|
|
if(res == NULL)
|
|
return -1;
|
|
ret = PyObject_IsTrue(res);
|
|
Py_DECREF(res);
|
|
return ret;
|
|
}
|
|
|
|
/* Couldn't find __contains__. */
|
|
if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
|
|
/* Assume the failure was simply due to that there is no
|
|
* __contains__ attribute, and try iterating instead.
|
|
*/
|
|
PyErr_Clear();
|
|
return _PySequence_IterSearch((PyObject *)inst, member,
|
|
PY_ITERSEARCH_CONTAINS) > 0;
|
|
}
|
|
else
|
|
return -1;
|
|
}
|
|
|
|
static PySequenceMethods
|
|
instance_as_sequence = {
|
|
(lenfunc)instance_length, /* sq_length */
|
|
0, /* sq_concat */
|
|
0, /* sq_repeat */
|
|
(ssizeargfunc)instance_item, /* sq_item */
|
|
(ssizessizeargfunc)instance_slice, /* sq_slice */
|
|
(ssizeobjargproc)instance_ass_item, /* sq_ass_item */
|
|
(ssizessizeobjargproc)instance_ass_slice,/* sq_ass_slice */
|
|
(objobjproc)instance_contains, /* sq_contains */
|
|
};
|
|
|
|
static PyObject *
|
|
generic_unary_op(PyInstanceObject *self, PyObject *methodname)
|
|
{
|
|
PyObject *func, *res;
|
|
|
|
if ((func = instance_getattr(self, methodname)) == NULL)
|
|
return NULL;
|
|
res = PyEval_CallObject(func, (PyObject *)NULL);
|
|
Py_DECREF(func);
|
|
return res;
|
|
}
|
|
|
|
static PyObject *
|
|
generic_binary_op(PyObject *v, PyObject *w, char *opname)
|
|
{
|
|
PyObject *result;
|
|
PyObject *args;
|
|
PyObject *func = PyObject_GetAttrString(v, opname);
|
|
if (func == NULL) {
|
|
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
|
|
return NULL;
|
|
PyErr_Clear();
|
|
Py_INCREF(Py_NotImplemented);
|
|
return Py_NotImplemented;
|
|
}
|
|
args = PyTuple_Pack(1, w);
|
|
if (args == NULL) {
|
|
Py_DECREF(func);
|
|
return NULL;
|
|
}
|
|
result = PyEval_CallObject(func, args);
|
|
Py_DECREF(args);
|
|
Py_DECREF(func);
|
|
return result;
|
|
}
|
|
|
|
|
|
static PyObject *coerce_obj;
|
|
|
|
/* Try one half of a binary operator involving a class instance. */
|
|
static PyObject *
|
|
half_binop(PyObject *v, PyObject *w, char *opname, binaryfunc thisfunc,
|
|
int swapped)
|
|
{
|
|
PyObject *args;
|
|
PyObject *coercefunc;
|
|
PyObject *coerced = NULL;
|
|
PyObject *v1;
|
|
PyObject *result;
|
|
|
|
if (!PyInstance_Check(v)) {
|
|
Py_INCREF(Py_NotImplemented);
|
|
return Py_NotImplemented;
|
|
}
|
|
|
|
if (coerce_obj == NULL) {
|
|
coerce_obj = PyString_InternFromString("__coerce__");
|
|
if (coerce_obj == NULL)
|
|
return NULL;
|
|
}
|
|
coercefunc = PyObject_GetAttr(v, coerce_obj);
|
|
if (coercefunc == NULL) {
|
|
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
|
|
return NULL;
|
|
PyErr_Clear();
|
|
return generic_binary_op(v, w, opname);
|
|
}
|
|
|
|
args = PyTuple_Pack(1, w);
|
|
if (args == NULL) {
|
|
Py_DECREF(coercefunc);
|
|
return NULL;
|
|
}
|
|
coerced = PyEval_CallObject(coercefunc, args);
|
|
Py_DECREF(args);
|
|
Py_DECREF(coercefunc);
|
|
if (coerced == NULL) {
|
|
return NULL;
|
|
}
|
|
if (coerced == Py_None || coerced == Py_NotImplemented) {
|
|
Py_DECREF(coerced);
|
|
return generic_binary_op(v, w, opname);
|
|
}
|
|
if (!PyTuple_Check(coerced) || PyTuple_Size(coerced) != 2) {
|
|
Py_DECREF(coerced);
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"coercion should return None or 2-tuple");
|
|
return NULL;
|
|
}
|
|
v1 = PyTuple_GetItem(coerced, 0);
|
|
w = PyTuple_GetItem(coerced, 1);
|
|
if (v1->ob_type == v->ob_type && PyInstance_Check(v)) {
|
|
/* prevent recursion if __coerce__ returns self as the first
|
|
* argument */
|
|
result = generic_binary_op(v1, w, opname);
|
|
} else {
|
|
if (swapped)
|
|
result = (thisfunc)(w, v1);
|
|
else
|
|
result = (thisfunc)(v1, w);
|
|
}
|
|
Py_DECREF(coerced);
|
|
return result;
|
|
}
|
|
|
|
/* Implement a binary operator involving at least one class instance. */
|
|
static PyObject *
|
|
do_binop(PyObject *v, PyObject *w, char *opname, char *ropname,
|
|
binaryfunc thisfunc)
|
|
{
|
|
PyObject *result = half_binop(v, w, opname, thisfunc, 0);
|
|
if (result == Py_NotImplemented) {
|
|
Py_DECREF(result);
|
|
result = half_binop(w, v, ropname, thisfunc, 1);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
static PyObject *
|
|
do_binop_inplace(PyObject *v, PyObject *w, char *iopname, char *opname,
|
|
char *ropname, binaryfunc thisfunc)
|
|
{
|
|
PyObject *result = half_binop(v, w, iopname, thisfunc, 0);
|
|
if (result == Py_NotImplemented) {
|
|
Py_DECREF(result);
|
|
result = do_binop(v, w, opname, ropname, thisfunc);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
static int
|
|
instance_coerce(PyObject **pv, PyObject **pw)
|
|
{
|
|
PyObject *v = *pv;
|
|
PyObject *w = *pw;
|
|
PyObject *coercefunc;
|
|
PyObject *args;
|
|
PyObject *coerced;
|
|
|
|
if (coerce_obj == NULL) {
|
|
coerce_obj = PyString_InternFromString("__coerce__");
|
|
if (coerce_obj == NULL)
|
|
return -1;
|
|
}
|
|
coercefunc = PyObject_GetAttr(v, coerce_obj);
|
|
if (coercefunc == NULL) {
|
|
/* No __coerce__ method */
|
|
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
|
|
return -1;
|
|
PyErr_Clear();
|
|
return 1;
|
|
}
|
|
/* Has __coerce__ method: call it */
|
|
args = PyTuple_Pack(1, w);
|
|
if (args == NULL) {
|
|
return -1;
|
|
}
|
|
coerced = PyEval_CallObject(coercefunc, args);
|
|
Py_DECREF(args);
|
|
Py_DECREF(coercefunc);
|
|
if (coerced == NULL) {
|
|
/* __coerce__ call raised an exception */
|
|
return -1;
|
|
}
|
|
if (coerced == Py_None || coerced == Py_NotImplemented) {
|
|
/* __coerce__ says "I can't do it" */
|
|
Py_DECREF(coerced);
|
|
return 1;
|
|
}
|
|
if (!PyTuple_Check(coerced) || PyTuple_Size(coerced) != 2) {
|
|
/* __coerce__ return value is malformed */
|
|
Py_DECREF(coerced);
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"coercion should return None or 2-tuple");
|
|
return -1;
|
|
}
|
|
/* __coerce__ returned two new values */
|
|
*pv = PyTuple_GetItem(coerced, 0);
|
|
*pw = PyTuple_GetItem(coerced, 1);
|
|
Py_INCREF(*pv);
|
|
Py_INCREF(*pw);
|
|
Py_DECREF(coerced);
|
|
return 0;
|
|
}
|
|
|
|
#define UNARY(funcname, methodname) \
|
|
static PyObject *funcname(PyInstanceObject *self) { \
|
|
static PyObject *o; \
|
|
if (o == NULL) o = PyString_InternFromString(methodname); \
|
|
return generic_unary_op(self, o); \
|
|
}
|
|
|
|
#define BINARY(f, m, n) \
|
|
static PyObject *f(PyObject *v, PyObject *w) { \
|
|
return do_binop(v, w, "__" m "__", "__r" m "__", n); \
|
|
}
|
|
|
|
#define BINARY_INPLACE(f, m, n) \
|
|
static PyObject *f(PyObject *v, PyObject *w) { \
|
|
return do_binop_inplace(v, w, "__i" m "__", "__" m "__", \
|
|
"__r" m "__", n); \
|
|
}
|
|
|
|
UNARY(instance_neg, "__neg__")
|
|
UNARY(instance_pos, "__pos__")
|
|
UNARY(instance_abs, "__abs__")
|
|
|
|
BINARY(instance_or, "or", PyNumber_Or)
|
|
BINARY(instance_and, "and", PyNumber_And)
|
|
BINARY(instance_xor, "xor", PyNumber_Xor)
|
|
BINARY(instance_lshift, "lshift", PyNumber_Lshift)
|
|
BINARY(instance_rshift, "rshift", PyNumber_Rshift)
|
|
BINARY(instance_add, "add", PyNumber_Add)
|
|
BINARY(instance_sub, "sub", PyNumber_Subtract)
|
|
BINARY(instance_mul, "mul", PyNumber_Multiply)
|
|
BINARY(instance_mod, "mod", PyNumber_Remainder)
|
|
BINARY(instance_divmod, "divmod", PyNumber_Divmod)
|
|
BINARY(instance_floordiv, "floordiv", PyNumber_FloorDivide)
|
|
BINARY(instance_truediv, "truediv", PyNumber_TrueDivide)
|
|
|
|
BINARY_INPLACE(instance_ior, "or", PyNumber_InPlaceOr)
|
|
BINARY_INPLACE(instance_ixor, "xor", PyNumber_InPlaceXor)
|
|
BINARY_INPLACE(instance_iand, "and", PyNumber_InPlaceAnd)
|
|
BINARY_INPLACE(instance_ilshift, "lshift", PyNumber_InPlaceLshift)
|
|
BINARY_INPLACE(instance_irshift, "rshift", PyNumber_InPlaceRshift)
|
|
BINARY_INPLACE(instance_iadd, "add", PyNumber_InPlaceAdd)
|
|
BINARY_INPLACE(instance_isub, "sub", PyNumber_InPlaceSubtract)
|
|
BINARY_INPLACE(instance_imul, "mul", PyNumber_InPlaceMultiply)
|
|
BINARY_INPLACE(instance_imod, "mod", PyNumber_InPlaceRemainder)
|
|
BINARY_INPLACE(instance_ifloordiv, "floordiv", PyNumber_InPlaceFloorDivide)
|
|
BINARY_INPLACE(instance_itruediv, "truediv", PyNumber_InPlaceTrueDivide)
|
|
|
|
/* Try a 3-way comparison, returning an int; v is an instance. Return:
|
|
-2 for an exception;
|
|
-1 if v < w;
|
|
0 if v == w;
|
|
1 if v > w;
|
|
2 if this particular 3-way comparison is not implemented or undefined.
|
|
*/
|
|
static int
|
|
half_cmp(PyObject *v, PyObject *w)
|
|
{
|
|
static PyObject *cmp_obj;
|
|
PyObject *args;
|
|
PyObject *cmp_func;
|
|
PyObject *result;
|
|
long l;
|
|
|
|
assert(PyInstance_Check(v));
|
|
|
|
if (cmp_obj == NULL) {
|
|
cmp_obj = PyString_InternFromString("__cmp__");
|
|
if (cmp_obj == NULL)
|
|
return -2;
|
|
}
|
|
|
|
cmp_func = PyObject_GetAttr(v, cmp_obj);
|
|
if (cmp_func == NULL) {
|
|
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
|
|
return -2;
|
|
PyErr_Clear();
|
|
return 2;
|
|
}
|
|
|
|
args = PyTuple_Pack(1, w);
|
|
if (args == NULL) {
|
|
Py_DECREF(cmp_func);
|
|
return -2;
|
|
}
|
|
|
|
result = PyEval_CallObject(cmp_func, args);
|
|
Py_DECREF(args);
|
|
Py_DECREF(cmp_func);
|
|
|
|
if (result == NULL)
|
|
return -2;
|
|
|
|
if (result == Py_NotImplemented) {
|
|
Py_DECREF(result);
|
|
return 2;
|
|
}
|
|
|
|
l = PyInt_AsLong(result);
|
|
Py_DECREF(result);
|
|
if (l == -1 && PyErr_Occurred()) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"comparison did not return an int");
|
|
return -2;
|
|
}
|
|
|
|
return l < 0 ? -1 : l > 0 ? 1 : 0;
|
|
}
|
|
|
|
/* Try a 3-way comparison, returning an int; either v or w is an instance.
|
|
We first try a coercion. Return:
|
|
-2 for an exception;
|
|
-1 if v < w;
|
|
0 if v == w;
|
|
1 if v > w;
|
|
2 if this particular 3-way comparison is not implemented or undefined.
|
|
THIS IS ONLY CALLED FROM object.c!
|
|
*/
|
|
static int
|
|
instance_compare(PyObject *v, PyObject *w)
|
|
{
|
|
int c;
|
|
|
|
c = PyNumber_CoerceEx(&v, &w);
|
|
if (c < 0)
|
|
return -2;
|
|
if (c == 0) {
|
|
/* If neither is now an instance, use regular comparison */
|
|
if (!PyInstance_Check(v) && !PyInstance_Check(w)) {
|
|
c = PyObject_Compare(v, w);
|
|
Py_DECREF(v);
|
|
Py_DECREF(w);
|
|
if (PyErr_Occurred())
|
|
return -2;
|
|
return c < 0 ? -1 : c > 0 ? 1 : 0;
|
|
}
|
|
}
|
|
else {
|
|
/* The coercion didn't do anything.
|
|
Treat this the same as returning v and w unchanged. */
|
|
Py_INCREF(v);
|
|
Py_INCREF(w);
|
|
}
|
|
|
|
if (PyInstance_Check(v)) {
|
|
c = half_cmp(v, w);
|
|
if (c <= 1) {
|
|
Py_DECREF(v);
|
|
Py_DECREF(w);
|
|
return c;
|
|
}
|
|
}
|
|
if (PyInstance_Check(w)) {
|
|
c = half_cmp(w, v);
|
|
if (c <= 1) {
|
|
Py_DECREF(v);
|
|
Py_DECREF(w);
|
|
if (c >= -1)
|
|
c = -c;
|
|
return c;
|
|
}
|
|
}
|
|
Py_DECREF(v);
|
|
Py_DECREF(w);
|
|
return 2;
|
|
}
|
|
|
|
static int
|
|
instance_nonzero(PyInstanceObject *self)
|
|
{
|
|
PyObject *func, *res;
|
|
long outcome;
|
|
static PyObject *nonzerostr;
|
|
|
|
if (nonzerostr == NULL)
|
|
nonzerostr = PyString_InternFromString("__nonzero__");
|
|
if ((func = instance_getattr(self, nonzerostr)) == NULL) {
|
|
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
|
|
return -1;
|
|
PyErr_Clear();
|
|
if (lenstr == NULL)
|
|
lenstr = PyString_InternFromString("__len__");
|
|
if ((func = instance_getattr(self, lenstr)) == NULL) {
|
|
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
|
|
return -1;
|
|
PyErr_Clear();
|
|
/* Fall back to the default behavior:
|
|
all instances are nonzero */
|
|
return 1;
|
|
}
|
|
}
|
|
res = PyEval_CallObject(func, (PyObject *)NULL);
|
|
Py_DECREF(func);
|
|
if (res == NULL)
|
|
return -1;
|
|
if (!PyInt_Check(res)) {
|
|
Py_DECREF(res);
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"__nonzero__ should return an int");
|
|
return -1;
|
|
}
|
|
outcome = PyInt_AsLong(res);
|
|
Py_DECREF(res);
|
|
if (outcome < 0) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"__nonzero__ should return >= 0");
|
|
return -1;
|
|
}
|
|
return outcome > 0;
|
|
}
|
|
|
|
static Py_ssize_t
|
|
instance_index(PyInstanceObject *self)
|
|
{
|
|
PyObject *func, *res;
|
|
Py_ssize_t outcome;
|
|
static PyObject *indexstr = NULL;
|
|
|
|
if (indexstr == NULL) {
|
|
indexstr = PyString_InternFromString("__index__");
|
|
if (indexstr == NULL)
|
|
return -1;
|
|
}
|
|
if ((func = instance_getattr(self, indexstr)) == NULL) {
|
|
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
|
|
return -1;
|
|
PyErr_Clear();
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"object cannot be interpreted as an index");
|
|
return -1;
|
|
}
|
|
res = PyEval_CallObject(func, (PyObject *)NULL);
|
|
Py_DECREF(func);
|
|
if (res == NULL)
|
|
return -1;
|
|
if (PyInt_Check(res) || PyLong_Check(res)) {
|
|
outcome = res->ob_type->tp_as_number->nb_index(res);
|
|
}
|
|
else {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"__index__ must return an int or a long");
|
|
outcome = -1;
|
|
}
|
|
Py_DECREF(res);
|
|
return outcome;
|
|
}
|
|
|
|
|
|
UNARY(instance_invert, "__invert__")
|
|
UNARY(instance_int, "__int__")
|
|
UNARY(instance_long, "__long__")
|
|
UNARY(instance_float, "__float__")
|
|
UNARY(instance_oct, "__oct__")
|
|
UNARY(instance_hex, "__hex__")
|
|
|
|
static PyObject *
|
|
bin_power(PyObject *v, PyObject *w)
|
|
{
|
|
return PyNumber_Power(v, w, Py_None);
|
|
}
|
|
|
|
/* This version is for ternary calls only (z != None) */
|
|
static PyObject *
|
|
instance_pow(PyObject *v, PyObject *w, PyObject *z)
|
|
{
|
|
if (z == Py_None) {
|
|
return do_binop(v, w, "__pow__", "__rpow__", bin_power);
|
|
}
|
|
else {
|
|
PyObject *func;
|
|
PyObject *args;
|
|
PyObject *result;
|
|
|
|
/* XXX Doesn't do coercions... */
|
|
func = PyObject_GetAttrString(v, "__pow__");
|
|
if (func == NULL)
|
|
return NULL;
|
|
args = PyTuple_Pack(2, w, z);
|
|
if (args == NULL) {
|
|
Py_DECREF(func);
|
|
return NULL;
|
|
}
|
|
result = PyEval_CallObject(func, args);
|
|
Py_DECREF(func);
|
|
Py_DECREF(args);
|
|
return result;
|
|
}
|
|
}
|
|
|
|
static PyObject *
|
|
bin_inplace_power(PyObject *v, PyObject *w)
|
|
{
|
|
return PyNumber_InPlacePower(v, w, Py_None);
|
|
}
|
|
|
|
|
|
static PyObject *
|
|
instance_ipow(PyObject *v, PyObject *w, PyObject *z)
|
|
{
|
|
if (z == Py_None) {
|
|
return do_binop_inplace(v, w, "__ipow__", "__pow__",
|
|
"__rpow__", bin_inplace_power);
|
|
}
|
|
else {
|
|
/* XXX Doesn't do coercions... */
|
|
PyObject *func;
|
|
PyObject *args;
|
|
PyObject *result;
|
|
|
|
func = PyObject_GetAttrString(v, "__ipow__");
|
|
if (func == NULL) {
|
|
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
|
|
return NULL;
|
|
PyErr_Clear();
|
|
return instance_pow(v, w, z);
|
|
}
|
|
args = PyTuple_Pack(2, w, z);
|
|
if (args == NULL) {
|
|
Py_DECREF(func);
|
|
return NULL;
|
|
}
|
|
result = PyEval_CallObject(func, args);
|
|
Py_DECREF(func);
|
|
Py_DECREF(args);
|
|
return result;
|
|
}
|
|
}
|
|
|
|
|
|
/* Map rich comparison operators to their __xx__ namesakes */
|
|
#define NAME_OPS 6
|
|
static PyObject **name_op = NULL;
|
|
|
|
static int
|
|
init_name_op(void)
|
|
{
|
|
int i;
|
|
char *_name_op[] = {
|
|
"__lt__",
|
|
"__le__",
|
|
"__eq__",
|
|
"__ne__",
|
|
"__gt__",
|
|
"__ge__",
|
|
};
|
|
|
|
name_op = (PyObject **)malloc(sizeof(PyObject *) * NAME_OPS);
|
|
if (name_op == NULL)
|
|
return -1;
|
|
for (i = 0; i < NAME_OPS; ++i) {
|
|
name_op[i] = PyString_InternFromString(_name_op[i]);
|
|
if (name_op[i] == NULL)
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static PyObject *
|
|
half_richcompare(PyObject *v, PyObject *w, int op)
|
|
{
|
|
PyObject *method;
|
|
PyObject *args;
|
|
PyObject *res;
|
|
|
|
assert(PyInstance_Check(v));
|
|
|
|
if (name_op == NULL) {
|
|
if (init_name_op() < 0)
|
|
return NULL;
|
|
}
|
|
/* If the instance doesn't define an __getattr__ method, use
|
|
instance_getattr2 directly because it will not set an
|
|
exception on failure. */
|
|
if (((PyInstanceObject *)v)->in_class->cl_getattr == NULL)
|
|
method = instance_getattr2((PyInstanceObject *)v,
|
|
name_op[op]);
|
|
else
|
|
method = PyObject_GetAttr(v, name_op[op]);
|
|
if (method == NULL) {
|
|
if (PyErr_Occurred()) {
|
|
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
|
|
return NULL;
|
|
PyErr_Clear();
|
|
}
|
|
res = Py_NotImplemented;
|
|
Py_INCREF(res);
|
|
return res;
|
|
}
|
|
|
|
args = PyTuple_Pack(1, w);
|
|
if (args == NULL) {
|
|
Py_DECREF(method);
|
|
return NULL;
|
|
}
|
|
|
|
res = PyEval_CallObject(method, args);
|
|
Py_DECREF(args);
|
|
Py_DECREF(method);
|
|
|
|
return res;
|
|
}
|
|
|
|
static PyObject *
|
|
instance_richcompare(PyObject *v, PyObject *w, int op)
|
|
{
|
|
PyObject *res;
|
|
|
|
if (PyInstance_Check(v)) {
|
|
res = half_richcompare(v, w, op);
|
|
if (res != Py_NotImplemented)
|
|
return res;
|
|
Py_DECREF(res);
|
|
}
|
|
|
|
if (PyInstance_Check(w)) {
|
|
res = half_richcompare(w, v, _Py_SwappedOp[op]);
|
|
if (res != Py_NotImplemented)
|
|
return res;
|
|
Py_DECREF(res);
|
|
}
|
|
|
|
Py_INCREF(Py_NotImplemented);
|
|
return Py_NotImplemented;
|
|
}
|
|
|
|
|
|
/* Get the iterator */
|
|
static PyObject *
|
|
instance_getiter(PyInstanceObject *self)
|
|
{
|
|
PyObject *func;
|
|
|
|
if (iterstr == NULL) {
|
|
iterstr = PyString_InternFromString("__iter__");
|
|
if (iterstr == NULL)
|
|
return NULL;
|
|
}
|
|
if (getitemstr == NULL) {
|
|
getitemstr = PyString_InternFromString("__getitem__");
|
|
if (getitemstr == NULL)
|
|
return NULL;
|
|
}
|
|
|
|
if ((func = instance_getattr(self, iterstr)) != NULL) {
|
|
PyObject *res = PyEval_CallObject(func, (PyObject *)NULL);
|
|
Py_DECREF(func);
|
|
if (res != NULL && !PyIter_Check(res)) {
|
|
PyErr_Format(PyExc_TypeError,
|
|
"__iter__ returned non-iterator "
|
|
"of type '%.100s'",
|
|
res->ob_type->tp_name);
|
|
Py_DECREF(res);
|
|
res = NULL;
|
|
}
|
|
return res;
|
|
}
|
|
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
|
|
return NULL;
|
|
PyErr_Clear();
|
|
if ((func = instance_getattr(self, getitemstr)) == NULL) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"iteration over non-sequence");
|
|
return NULL;
|
|
}
|
|
Py_DECREF(func);
|
|
return PySeqIter_New((PyObject *)self);
|
|
}
|
|
|
|
|
|
/* Call the iterator's next */
|
|
static PyObject *
|
|
instance_iternext(PyInstanceObject *self)
|
|
{
|
|
PyObject *func;
|
|
|
|
if (nextstr == NULL)
|
|
nextstr = PyString_InternFromString("next");
|
|
|
|
if ((func = instance_getattr(self, nextstr)) != NULL) {
|
|
PyObject *res = PyEval_CallObject(func, (PyObject *)NULL);
|
|
Py_DECREF(func);
|
|
if (res != NULL) {
|
|
return res;
|
|
}
|
|
if (PyErr_ExceptionMatches(PyExc_StopIteration)) {
|
|
PyErr_Clear();
|
|
return NULL;
|
|
}
|
|
return NULL;
|
|
}
|
|
PyErr_SetString(PyExc_TypeError, "instance has no next() method");
|
|
return NULL;
|
|
}
|
|
|
|
static PyObject *
|
|
instance_call(PyObject *func, PyObject *arg, PyObject *kw)
|
|
{
|
|
PyObject *res, *call = PyObject_GetAttrString(func, "__call__");
|
|
if (call == NULL) {
|
|
PyInstanceObject *inst = (PyInstanceObject*) func;
|
|
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
|
|
return NULL;
|
|
PyErr_Clear();
|
|
PyErr_Format(PyExc_AttributeError,
|
|
"%.200s instance has no __call__ method",
|
|
PyString_AsString(inst->in_class->cl_name));
|
|
return NULL;
|
|
}
|
|
/* We must check and increment the recursion depth here. Scenario:
|
|
class A:
|
|
pass
|
|
A.__call__ = A() # that's right
|
|
a = A() # ok
|
|
a() # infinite recursion
|
|
This bounces between instance_call() and PyObject_Call() without
|
|
ever hitting eval_frame() (which has the main recursion check). */
|
|
if (Py_EnterRecursiveCall(" in __call__")) {
|
|
res = NULL;
|
|
}
|
|
else {
|
|
res = PyObject_Call(call, arg, kw);
|
|
Py_LeaveRecursiveCall();
|
|
}
|
|
Py_DECREF(call);
|
|
return res;
|
|
}
|
|
|
|
|
|
static PyNumberMethods instance_as_number = {
|
|
instance_add, /* nb_add */
|
|
instance_sub, /* nb_subtract */
|
|
instance_mul, /* nb_multiply */
|
|
instance_mod, /* nb_remainder */
|
|
instance_divmod, /* nb_divmod */
|
|
instance_pow, /* nb_power */
|
|
(unaryfunc)instance_neg, /* nb_negative */
|
|
(unaryfunc)instance_pos, /* nb_positive */
|
|
(unaryfunc)instance_abs, /* nb_absolute */
|
|
(inquiry)instance_nonzero, /* nb_nonzero */
|
|
(unaryfunc)instance_invert, /* nb_invert */
|
|
instance_lshift, /* nb_lshift */
|
|
instance_rshift, /* nb_rshift */
|
|
instance_and, /* nb_and */
|
|
instance_xor, /* nb_xor */
|
|
instance_or, /* nb_or */
|
|
instance_coerce, /* nb_coerce */
|
|
(unaryfunc)instance_int, /* nb_int */
|
|
(unaryfunc)instance_long, /* nb_long */
|
|
(unaryfunc)instance_float, /* nb_float */
|
|
(unaryfunc)instance_oct, /* nb_oct */
|
|
(unaryfunc)instance_hex, /* nb_hex */
|
|
instance_iadd, /* nb_inplace_add */
|
|
instance_isub, /* nb_inplace_subtract */
|
|
instance_imul, /* nb_inplace_multiply */
|
|
instance_imod, /* nb_inplace_remainder */
|
|
instance_ipow, /* nb_inplace_power */
|
|
instance_ilshift, /* nb_inplace_lshift */
|
|
instance_irshift, /* nb_inplace_rshift */
|
|
instance_iand, /* nb_inplace_and */
|
|
instance_ixor, /* nb_inplace_xor */
|
|
instance_ior, /* nb_inplace_or */
|
|
instance_floordiv, /* nb_floor_divide */
|
|
instance_truediv, /* nb_true_divide */
|
|
instance_ifloordiv, /* nb_inplace_floor_divide */
|
|
instance_itruediv, /* nb_inplace_true_divide */
|
|
(lenfunc)instance_index, /* nb_index */
|
|
};
|
|
|
|
PyTypeObject PyInstance_Type = {
|
|
PyObject_HEAD_INIT(&PyType_Type)
|
|
0,
|
|
"instance",
|
|
sizeof(PyInstanceObject),
|
|
0,
|
|
(destructor)instance_dealloc, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
instance_compare, /* tp_compare */
|
|
(reprfunc)instance_repr, /* tp_repr */
|
|
&instance_as_number, /* tp_as_number */
|
|
&instance_as_sequence, /* tp_as_sequence */
|
|
&instance_as_mapping, /* tp_as_mapping */
|
|
(hashfunc)instance_hash, /* tp_hash */
|
|
instance_call, /* tp_call */
|
|
(reprfunc)instance_str, /* tp_str */
|
|
(getattrofunc)instance_getattr, /* tp_getattro */
|
|
(setattrofunc)instance_setattr, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_CHECKTYPES,/*tp_flags*/
|
|
instance_doc, /* tp_doc */
|
|
(traverseproc)instance_traverse, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
instance_richcompare, /* tp_richcompare */
|
|
offsetof(PyInstanceObject, in_weakreflist), /* tp_weaklistoffset */
|
|
(getiterfunc)instance_getiter, /* tp_iter */
|
|
(iternextfunc)instance_iternext, /* tp_iternext */
|
|
0, /* tp_methods */
|
|
0, /* tp_members */
|
|
0, /* tp_getset */
|
|
0, /* tp_base */
|
|
0, /* tp_dict */
|
|
0, /* tp_descr_get */
|
|
0, /* tp_descr_set */
|
|
0, /* tp_dictoffset */
|
|
0, /* tp_init */
|
|
0, /* tp_alloc */
|
|
instance_new, /* tp_new */
|
|
};
|
|
|
|
|
|
/* Instance method objects are used for two purposes:
|
|
(a) as bound instance methods (returned by instancename.methodname)
|
|
(b) as unbound methods (returned by ClassName.methodname)
|
|
In case (b), im_self is NULL
|
|
*/
|
|
|
|
static PyMethodObject *free_list;
|
|
|
|
PyObject *
|
|
PyMethod_New(PyObject *func, PyObject *self, PyObject *klass)
|
|
{
|
|
register PyMethodObject *im;
|
|
if (!PyCallable_Check(func)) {
|
|
PyErr_BadInternalCall();
|
|
return NULL;
|
|
}
|
|
im = free_list;
|
|
if (im != NULL) {
|
|
free_list = (PyMethodObject *)(im->im_self);
|
|
PyObject_INIT(im, &PyMethod_Type);
|
|
}
|
|
else {
|
|
im = PyObject_GC_New(PyMethodObject, &PyMethod_Type);
|
|
if (im == NULL)
|
|
return NULL;
|
|
}
|
|
im->im_weakreflist = NULL;
|
|
Py_INCREF(func);
|
|
im->im_func = func;
|
|
Py_XINCREF(self);
|
|
im->im_self = self;
|
|
Py_XINCREF(klass);
|
|
im->im_class = klass;
|
|
_PyObject_GC_TRACK(im);
|
|
return (PyObject *)im;
|
|
}
|
|
|
|
/* Descriptors for PyMethod attributes */
|
|
|
|
/* im_class, im_func and im_self are stored in the PyMethod object */
|
|
|
|
#define OFF(x) offsetof(PyMethodObject, x)
|
|
|
|
static PyMemberDef instancemethod_memberlist[] = {
|
|
{"im_class", T_OBJECT, OFF(im_class), READONLY|RESTRICTED,
|
|
"the class associated with a method"},
|
|
{"im_func", T_OBJECT, OFF(im_func), READONLY|RESTRICTED,
|
|
"the function (or other callable) implementing a method"},
|
|
{"im_self", T_OBJECT, OFF(im_self), READONLY|RESTRICTED,
|
|
"the instance to which a method is bound; None for unbound methods"},
|
|
{NULL} /* Sentinel */
|
|
};
|
|
|
|
/* Christian Tismer argued convincingly that method attributes should
|
|
(nearly) always override function attributes.
|
|
The one exception is __doc__; there's a default __doc__ which
|
|
should only be used for the class, not for instances */
|
|
|
|
static PyObject *
|
|
instancemethod_get_doc(PyMethodObject *im, void *context)
|
|
{
|
|
static PyObject *docstr;
|
|
if (docstr == NULL) {
|
|
docstr= PyString_InternFromString("__doc__");
|
|
if (docstr == NULL)
|
|
return NULL;
|
|
}
|
|
return PyObject_GetAttr(im->im_func, docstr);
|
|
}
|
|
|
|
static PyGetSetDef instancemethod_getset[] = {
|
|
{"__doc__", (getter)instancemethod_get_doc, NULL, NULL},
|
|
{0}
|
|
};
|
|
|
|
static PyObject *
|
|
instancemethod_getattro(PyObject *obj, PyObject *name)
|
|
{
|
|
PyMethodObject *im = (PyMethodObject *)obj;
|
|
PyTypeObject *tp = obj->ob_type;
|
|
PyObject *descr = NULL;
|
|
|
|
if (PyType_HasFeature(tp, Py_TPFLAGS_HAVE_CLASS)) {
|
|
if (tp->tp_dict == NULL) {
|
|
if (PyType_Ready(tp) < 0)
|
|
return NULL;
|
|
}
|
|
descr = _PyType_Lookup(tp, name);
|
|
}
|
|
|
|
if (descr != NULL) {
|
|
descrgetfunc f = TP_DESCR_GET(descr->ob_type);
|
|
if (f != NULL)
|
|
return f(descr, obj, (PyObject *)obj->ob_type);
|
|
else {
|
|
Py_INCREF(descr);
|
|
return descr;
|
|
}
|
|
}
|
|
|
|
return PyObject_GetAttr(im->im_func, name);
|
|
}
|
|
|
|
PyDoc_STRVAR(instancemethod_doc,
|
|
"instancemethod(function, instance, class)\n\
|
|
\n\
|
|
Create an instance method object.");
|
|
|
|
static PyObject *
|
|
instancemethod_new(PyTypeObject* type, PyObject* args, PyObject *kw)
|
|
{
|
|
PyObject *func;
|
|
PyObject *self;
|
|
PyObject *classObj = NULL;
|
|
|
|
if (!PyArg_UnpackTuple(args, "instancemethod", 2, 3,
|
|
&func, &self, &classObj))
|
|
return NULL;
|
|
if (!PyCallable_Check(func)) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"first argument must be callable");
|
|
return NULL;
|
|
}
|
|
if (self == Py_None)
|
|
self = NULL;
|
|
if (self == NULL && classObj == NULL) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"unbound methods must have non-NULL im_class");
|
|
return NULL;
|
|
}
|
|
|
|
return PyMethod_New(func, self, classObj);
|
|
}
|
|
|
|
static void
|
|
instancemethod_dealloc(register PyMethodObject *im)
|
|
{
|
|
_PyObject_GC_UNTRACK(im);
|
|
if (im->im_weakreflist != NULL)
|
|
PyObject_ClearWeakRefs((PyObject *)im);
|
|
Py_DECREF(im->im_func);
|
|
Py_XDECREF(im->im_self);
|
|
Py_XDECREF(im->im_class);
|
|
im->im_self = (PyObject *)free_list;
|
|
free_list = im;
|
|
}
|
|
|
|
static int
|
|
instancemethod_compare(PyMethodObject *a, PyMethodObject *b)
|
|
{
|
|
if (a->im_self != b->im_self)
|
|
return (a->im_self < b->im_self) ? -1 : 1;
|
|
return PyObject_Compare(a->im_func, b->im_func);
|
|
}
|
|
|
|
static PyObject *
|
|
instancemethod_repr(PyMethodObject *a)
|
|
{
|
|
PyObject *self = a->im_self;
|
|
PyObject *func = a->im_func;
|
|
PyObject *klass = a->im_class;
|
|
PyObject *funcname = NULL, *klassname = NULL, *result = NULL;
|
|
char *sfuncname = "?", *sklassname = "?";
|
|
|
|
funcname = PyObject_GetAttrString(func, "__name__");
|
|
if (funcname == NULL) {
|
|
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
|
|
return NULL;
|
|
PyErr_Clear();
|
|
}
|
|
else if (!PyString_Check(funcname)) {
|
|
Py_DECREF(funcname);
|
|
funcname = NULL;
|
|
}
|
|
else
|
|
sfuncname = PyString_AS_STRING(funcname);
|
|
if (klass == NULL)
|
|
klassname = NULL;
|
|
else {
|
|
klassname = PyObject_GetAttrString(klass, "__name__");
|
|
if (klassname == NULL) {
|
|
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
|
|
return NULL;
|
|
PyErr_Clear();
|
|
}
|
|
else if (!PyString_Check(klassname)) {
|
|
Py_DECREF(klassname);
|
|
klassname = NULL;
|
|
}
|
|
else
|
|
sklassname = PyString_AS_STRING(klassname);
|
|
}
|
|
if (self == NULL)
|
|
result = PyString_FromFormat("<unbound method %s.%s>",
|
|
sklassname, sfuncname);
|
|
else {
|
|
/* XXX Shouldn't use repr() here! */
|
|
PyObject *selfrepr = PyObject_Repr(self);
|
|
if (selfrepr == NULL)
|
|
goto fail;
|
|
if (!PyString_Check(selfrepr)) {
|
|
Py_DECREF(selfrepr);
|
|
goto fail;
|
|
}
|
|
result = PyString_FromFormat("<bound method %s.%s of %s>",
|
|
sklassname, sfuncname,
|
|
PyString_AS_STRING(selfrepr));
|
|
Py_DECREF(selfrepr);
|
|
}
|
|
fail:
|
|
Py_XDECREF(funcname);
|
|
Py_XDECREF(klassname);
|
|
return result;
|
|
}
|
|
|
|
static long
|
|
instancemethod_hash(PyMethodObject *a)
|
|
{
|
|
long x, y;
|
|
if (a->im_self == NULL)
|
|
x = PyObject_Hash(Py_None);
|
|
else
|
|
x = PyObject_Hash(a->im_self);
|
|
if (x == -1)
|
|
return -1;
|
|
y = PyObject_Hash(a->im_func);
|
|
if (y == -1)
|
|
return -1;
|
|
return x ^ y;
|
|
}
|
|
|
|
static int
|
|
instancemethod_traverse(PyMethodObject *im, visitproc visit, void *arg)
|
|
{
|
|
Py_VISIT(im->im_func);
|
|
Py_VISIT(im->im_self);
|
|
Py_VISIT(im->im_class);
|
|
return 0;
|
|
}
|
|
|
|
static void
|
|
getclassname(PyObject *klass, char *buf, int bufsize)
|
|
{
|
|
PyObject *name;
|
|
|
|
assert(bufsize > 1);
|
|
strcpy(buf, "?"); /* Default outcome */
|
|
if (klass == NULL)
|
|
return;
|
|
name = PyObject_GetAttrString(klass, "__name__");
|
|
if (name == NULL) {
|
|
/* This function cannot return an exception */
|
|
PyErr_Clear();
|
|
return;
|
|
}
|
|
if (PyString_Check(name)) {
|
|
strncpy(buf, PyString_AS_STRING(name), bufsize);
|
|
buf[bufsize-1] = '\0';
|
|
}
|
|
Py_DECREF(name);
|
|
}
|
|
|
|
static void
|
|
getinstclassname(PyObject *inst, char *buf, int bufsize)
|
|
{
|
|
PyObject *klass;
|
|
|
|
if (inst == NULL) {
|
|
assert(bufsize > 0 && (size_t)bufsize > strlen("nothing"));
|
|
strcpy(buf, "nothing");
|
|
return;
|
|
}
|
|
|
|
klass = PyObject_GetAttrString(inst, "__class__");
|
|
if (klass == NULL) {
|
|
/* This function cannot return an exception */
|
|
PyErr_Clear();
|
|
klass = (PyObject *)(inst->ob_type);
|
|
Py_INCREF(klass);
|
|
}
|
|
getclassname(klass, buf, bufsize);
|
|
Py_XDECREF(klass);
|
|
}
|
|
|
|
static PyObject *
|
|
instancemethod_call(PyObject *func, PyObject *arg, PyObject *kw)
|
|
{
|
|
PyObject *self = PyMethod_GET_SELF(func);
|
|
PyObject *klass = PyMethod_GET_CLASS(func);
|
|
PyObject *result;
|
|
|
|
func = PyMethod_GET_FUNCTION(func);
|
|
if (self == NULL) {
|
|
/* Unbound methods must be called with an instance of
|
|
the class (or a derived class) as first argument */
|
|
int ok;
|
|
if (PyTuple_Size(arg) >= 1)
|
|
self = PyTuple_GET_ITEM(arg, 0);
|
|
if (self == NULL)
|
|
ok = 0;
|
|
else {
|
|
ok = PyObject_IsInstance(self, klass);
|
|
if (ok < 0)
|
|
return NULL;
|
|
}
|
|
if (!ok) {
|
|
char clsbuf[256];
|
|
char instbuf[256];
|
|
getclassname(klass, clsbuf, sizeof(clsbuf));
|
|
getinstclassname(self, instbuf, sizeof(instbuf));
|
|
PyErr_Format(PyExc_TypeError,
|
|
"unbound method %s%s must be called with "
|
|
"%s instance as first argument "
|
|
"(got %s%s instead)",
|
|
PyEval_GetFuncName(func),
|
|
PyEval_GetFuncDesc(func),
|
|
clsbuf,
|
|
instbuf,
|
|
self == NULL ? "" : " instance");
|
|
return NULL;
|
|
}
|
|
Py_INCREF(arg);
|
|
}
|
|
else {
|
|
Py_ssize_t argcount = PyTuple_Size(arg);
|
|
PyObject *newarg = PyTuple_New(argcount + 1);
|
|
int i;
|
|
if (newarg == NULL)
|
|
return NULL;
|
|
Py_INCREF(self);
|
|
PyTuple_SET_ITEM(newarg, 0, self);
|
|
for (i = 0; i < argcount; i++) {
|
|
PyObject *v = PyTuple_GET_ITEM(arg, i);
|
|
Py_XINCREF(v);
|
|
PyTuple_SET_ITEM(newarg, i+1, v);
|
|
}
|
|
arg = newarg;
|
|
}
|
|
result = PyObject_Call((PyObject *)func, arg, kw);
|
|
Py_DECREF(arg);
|
|
return result;
|
|
}
|
|
|
|
static PyObject *
|
|
instancemethod_descr_get(PyObject *meth, PyObject *obj, PyObject *cls)
|
|
{
|
|
/* Don't rebind an already bound method, or an unbound method
|
|
of a class that's not a base class of cls. */
|
|
|
|
if (PyMethod_GET_SELF(meth) != NULL) {
|
|
/* Already bound */
|
|
Py_INCREF(meth);
|
|
return meth;
|
|
}
|
|
/* No, it is an unbound method */
|
|
if (PyMethod_GET_CLASS(meth) != NULL && cls != NULL) {
|
|
/* Do subclass test. If it fails, return meth unchanged. */
|
|
int ok = PyObject_IsSubclass(cls, PyMethod_GET_CLASS(meth));
|
|
if (ok < 0)
|
|
return NULL;
|
|
if (!ok) {
|
|
Py_INCREF(meth);
|
|
return meth;
|
|
}
|
|
}
|
|
/* Bind it to obj */
|
|
return PyMethod_New(PyMethod_GET_FUNCTION(meth), obj, cls);
|
|
}
|
|
|
|
PyTypeObject PyMethod_Type = {
|
|
PyObject_HEAD_INIT(&PyType_Type)
|
|
0,
|
|
"instancemethod",
|
|
sizeof(PyMethodObject),
|
|
0,
|
|
(destructor)instancemethod_dealloc, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
(cmpfunc)instancemethod_compare, /* tp_compare */
|
|
(reprfunc)instancemethod_repr, /* tp_repr */
|
|
0, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
(hashfunc)instancemethod_hash, /* tp_hash */
|
|
instancemethod_call, /* tp_call */
|
|
0, /* tp_str */
|
|
instancemethod_getattro, /* tp_getattro */
|
|
PyObject_GenericSetAttr, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_HAVE_WEAKREFS, /* tp_flags */
|
|
instancemethod_doc, /* tp_doc */
|
|
(traverseproc)instancemethod_traverse, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
offsetof(PyMethodObject, im_weakreflist), /* tp_weaklistoffset */
|
|
0, /* tp_iter */
|
|
0, /* tp_iternext */
|
|
0, /* tp_methods */
|
|
instancemethod_memberlist, /* tp_members */
|
|
instancemethod_getset, /* tp_getset */
|
|
0, /* tp_base */
|
|
0, /* tp_dict */
|
|
instancemethod_descr_get, /* tp_descr_get */
|
|
0, /* tp_descr_set */
|
|
0, /* tp_dictoffset */
|
|
0, /* tp_init */
|
|
0, /* tp_alloc */
|
|
instancemethod_new, /* tp_new */
|
|
};
|
|
|
|
/* Clear out the free list */
|
|
|
|
void
|
|
PyMethod_Fini(void)
|
|
{
|
|
while (free_list) {
|
|
PyMethodObject *im = free_list;
|
|
free_list = (PyMethodObject *)(im->im_self);
|
|
PyObject_GC_Del(im);
|
|
}
|
|
}
|