cpython-lru_cache-weakref: Python/structmember.c annotate

annotate Python/structmember.c @ 42309:bd6acfdb47d2

Merged revisions 56301-56442 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r56322 | kurt.kaiser | 2007-07-12 11:35:03 -0700 (Thu, 12 Jul 2007) | 2 lines Replace obscure code which was failing in py3k. ................ r56323 | kurt.kaiser | 2007-07-12 11:44:12 -0700 (Thu, 12 Jul 2007) | 3 lines 1. Remove new division option 2. Update IDLE version to 3.0x ................ r56327 | kurt.kaiser | 2007-07-12 12:20:20 -0700 (Thu, 12 Jul 2007) | 5 lines Fix another instance of this defect in Tkinter, and one in IDLE. Patch 1724999 by Ali Gholami Rudi -- avoid complaints about dict size change during iter in destroy call. ................ r56339 | georg.brandl | 2007-07-13 03:07:25 -0700 (Fri, 13 Jul 2007) | 2 lines Fix #1753310: regrtest -x doesn't work anymore ................ r56361 | kurt.kaiser | 2007-07-13 18:25:24 -0700 (Fri, 13 Jul 2007) | 2 lines convert a map() iterator to a list to get this working. ................ r56362 | kurt.kaiser | 2007-07-13 18:53:45 -0700 (Fri, 13 Jul 2007) | 2 lines Was modifying dict during iteration. ................ r56376 | collin.winter | 2007-07-14 11:56:19 -0700 (Sat, 14 Jul 2007) | 1 line Add an example of class decorators to test_grammar. ................ r56377 | collin.winter | 2007-07-14 12:00:17 -0700 (Sat, 14 Jul 2007) | 1 line Add a basic example of dictcomps to test_grammar. ................ r56413 | neal.norwitz | 2007-07-17 00:21:18 -0700 (Tue, 17 Jul 2007) | 149 lines Merged revisions 56202-56412 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r56204 | ronald.oussoren | 2007-07-08 23:02:21 -0700 (Sun, 08 Jul 2007) | 2 lines Patch 1693258: Fix for duplicate "preferences" menu-OS X ........ r56207 | ronald.oussoren | 2007-07-09 01:41:15 -0700 (Mon, 09 Jul 2007) | 4 lines Patch 1673122: be explicit about which libtool to use, to avoid name clashes when a users install GNU libtool early in his PATH ........ r56280 | georg.brandl | 2007-07-11 12:41:49 -0700 (Wed, 11 Jul 2007) | 2 lines Fix #1752132: wrong comment in opcode description. ........ r56293 | georg.brandl | 2007-07-12 01:05:45 -0700 (Thu, 12 Jul 2007) | 3 lines Patch #1752270, #1750931: complain if urllib2 add_handler called without handler. ........ r56296 | georg.brandl | 2007-07-12 01:11:29 -0700 (Thu, 12 Jul 2007) | 2 lines Patch #1739696: use code.co_code only if really necessary ........ r56298 | georg.brandl | 2007-07-12 01:38:00 -0700 (Thu, 12 Jul 2007) | 3 lines Patch #1673759: add a missing overflow check when formatting floats with %G. ........ r56302 | georg.brandl | 2007-07-12 02:06:41 -0700 (Thu, 12 Jul 2007) | 2 lines Patch #1731659: improve time.strptime docs. ........ r56304 | georg.brandl | 2007-07-12 02:24:04 -0700 (Thu, 12 Jul 2007) | 2 lines Patch #1731169: clean up expected skips list. ........ r56306 | georg.brandl | 2007-07-12 02:37:49 -0700 (Thu, 12 Jul 2007) | 3 lines Bug #1637365: add subsection about "__name__ == __main__" to the Python tutorial. ........ r56308 | georg.brandl | 2007-07-12 02:59:22 -0700 (Thu, 12 Jul 2007) | 5 lines Patch #1675424: Added tests for uncovered code in the zipfile module. The KeyError raised by Zipfile.getinfo for nonexistent names now has a descriptive message. ........ r56340 | facundo.batista | 2007-07-13 03:43:44 -0700 (Fri, 13 Jul 2007) | 6 lines Added tests for basic behavior of DateTime, Binary, and Fault classes and the escape function. Check that marshalling recursive sequences & dicts raises TypeError. Check that marshalling out-of-range ints raises OverflowError [Alan McIntyre - GSoC] ........ r56345 | raymond.hettinger | 2007-07-13 05:09:41 -0700 (Fri, 13 Jul 2007) | 1 line Correct the docs for takewhile(). Improve the recipe for nth(). Should be backported ........ r56348 | thomas.heller | 2007-07-13 06:59:39 -0700 (Fri, 13 Jul 2007) | 4 lines Repair COMError. Since exceptions are new style classes now, setting the methods and docstring after the type creation does not work, they must be in the dictionary before creating the type. ........ r56349 | thomas.heller | 2007-07-13 07:18:06 -0700 (Fri, 13 Jul 2007) | 1 line Add tests for _ctypes.COMError. ........ r56350 | thomas.heller | 2007-07-13 09:50:43 -0700 (Fri, 13 Jul 2007) | 4 lines Do not try to load the GLUT library in the ctypes tests. This test adds little value, but has a large problem on OS X, as explained in SF# 1581906. ........ r56352 | thomas.heller | 2007-07-13 10:12:23 -0700 (Fri, 13 Jul 2007) | 3 lines Fix for SF# 1701409: segfault in c_char_p of ctypes. The repr output of c_char_p and c_wchar_p has changed as a sideeffect. ........ r56355 | thomas.heller | 2007-07-13 10:46:54 -0700 (Fri, 13 Jul 2007) | 3 lines Fix for SF# 1649098: avoid zero-sized array declaration in structure. ........ r56357 | thomas.heller | 2007-07-13 12:51:55 -0700 (Fri, 13 Jul 2007) | 3 lines PyType_stgdict() returns a borrowed reference which must not be Py_DECREF'd. ........ r56360 | barry.warsaw | 2007-07-13 15:12:58 -0700 (Fri, 13 Jul 2007) | 10 lines In response to this SF bug: [ 1752723 ] email.message_from_string: initial line gets discarded I added a test to assert that when the first line of text passed to message_from_string() contains a leading space, the message ends up with the appropriate FirstHeaderLineIsContinuationDefect on its defects list. The bug is invalid. ........ r56364 | georg.brandl | 2007-07-14 10:12:23 -0700 (Sat, 14 Jul 2007) | 2 lines Bug #1753406: missing \versionadded for subprocess.check_call. ........ r56366 | georg.brandl | 2007-07-14 10:32:41 -0700 (Sat, 14 Jul 2007) | 2 lines Clarify webbrowser.open description. ........ r56380 | andrew.kuchling | 2007-07-14 13:58:21 -0700 (Sat, 14 Jul 2007) | 1 line Typo fix ........ r56382 | andrew.kuchling | 2007-07-14 14:56:19 -0700 (Sat, 14 Jul 2007) | 7 lines Avoid exception if there's a stray directory inside a Maildir folder. The Maildir specification doesn't seem to say anything about this situation, and it can happen if you're keeping a Maildir mailbox in Subversion (.svn directories) or some similar system. The patch just ignores directories in the cur/, new/, tmp/ folders. ........ r56392 | facundo.batista | 2007-07-14 15:41:45 -0700 (Sat, 14 Jul 2007) | 6 lines First version. Includes tests for helper functions: read, write, _exception, readwrite, closeall, compact_traceback; and for classes dispatcher, dispatcher_with_send, and file_wrapper. [Alan McIntyre - GSoC] ........ r56399 | facundo.batista | 2007-07-15 13:30:39 -0700 (Sun, 15 Jul 2007) | 5 lines Changed the used port and commented out some tests that uses a non documented function that appers to uses resources not present in Windows. ........ r56412 | facundo.batista | 2007-07-16 19:19:39 -0700 (Mon, 16 Jul 2007) | 6 lines Prevent asyncore.dispatcher tests from hanging by adding loop counters to server & client, and by adding asyncore.close_all calls in tearDown. Also choose correct expected logging results based on the value of __debug__ [Alan McIntyre - GSoC] ........ ................ r56442 | guido.van.rossum | 2007-07-18 10:26:38 -0700 (Wed, 18 Jul 2007) | 14 lines Merged revisions 56413-56441 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r56439 | georg.brandl | 2007-07-17 23:37:55 -0700 (Tue, 17 Jul 2007) | 2 lines Use "Unix" as platform name, not "UNIX". ........ r56441 | guido.van.rossum | 2007-07-18 10:19:14 -0700 (Wed, 18 Jul 2007) | 3 lines SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. (Slightly tweaked for style and refcounts.) ........ ................

author	Guido van Rossum <guido@python.org>
date	Wed, 18 Jul 2007 18:15:48 +0000
parents	e4f649c4f457
children	3fc3cedc49ca

rev	line source
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 95 diff changeset	1
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	2 /* Map C struct members to Python object attributes */
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	3
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	4 #include "Python.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	5
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	6 #include "structmember.h"
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	7
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	8 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	9 listmembers(struct memberlist *mlist)
398 0ac1357cd898 Added __members__ secret attribute Guido van Rossum <guido@python.org> parents: 145 diff changeset	10 {
0ac1357cd898 Added __members__ secret attribute Guido van Rossum <guido@python.org> parents: 145 diff changeset	11 int i, n;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	12 PyObject *v;
398 0ac1357cd898 Added __members__ secret attribute Guido van Rossum <guido@python.org> parents: 145 diff changeset	13 for (n = 0; mlist[n].name != NULL; n++)
0ac1357cd898 Added __members__ secret attribute Guido van Rossum <guido@python.org> parents: 145 diff changeset	14 ;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	15 v = PyList_New(n);
398 0ac1357cd898 Added __members__ secret attribute Guido van Rossum <guido@python.org> parents: 145 diff changeset	16 if (v != NULL) {
0ac1357cd898 Added __members__ secret attribute Guido van Rossum <guido@python.org> parents: 145 diff changeset	17 for (i = 0; i < n; i++)
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	18 PyList_SetItem(v, i,
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	19 PyString_FromString(mlist[i].name));
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	20 if (PyErr_Occurred()) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	21 Py_DECREF(v);
398 0ac1357cd898 Added __members__ secret attribute Guido van Rossum <guido@python.org> parents: 145 diff changeset	22 v = NULL;
0ac1357cd898 Added __members__ secret attribute Guido van Rossum <guido@python.org> parents: 145 diff changeset	23 }
0ac1357cd898 Added __members__ secret attribute Guido van Rossum <guido@python.org> parents: 145 diff changeset	24 else {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	25 PyList_Sort(v);
398 0ac1357cd898 Added __members__ secret attribute Guido van Rossum <guido@python.org> parents: 145 diff changeset	26 }
0ac1357cd898 Added __members__ secret attribute Guido van Rossum <guido@python.org> parents: 145 diff changeset	27 }
0ac1357cd898 Added __members__ secret attribute Guido van Rossum <guido@python.org> parents: 145 diff changeset	28 return v;
0ac1357cd898 Added __members__ secret attribute Guido van Rossum <guido@python.org> parents: 145 diff changeset	29 }
0ac1357cd898 Added __members__ secret attribute Guido van Rossum <guido@python.org> parents: 145 diff changeset	30
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	31 PyObject *
36114 e9a10f74cf88 const poisoning, spreading to fix new const warnings Tim Peters <tim.peters@gmail.com> parents: 34677 diff changeset	32 PyMember_Get(const char addr, struct memberlist mlist, const char *name)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	33 {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	34 struct memberlist *l;
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	35
398 0ac1357cd898 Added __members__ secret attribute Guido van Rossum <guido@python.org> parents: 145 diff changeset	36 if (strcmp(name, "__members__") == 0)
0ac1357cd898 Added __members__ secret attribute Guido van Rossum <guido@python.org> parents: 145 diff changeset	37 return listmembers(mlist);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	38 for (l = mlist; l->name != NULL; l++) {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	39 if (strcmp(l->name, name) == 0) {
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	40 PyMemberDef copy;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	41 copy.name = l->name;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	42 copy.type = l->type;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	43 copy.offset = l->offset;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	44 copy.flags = l->flags;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	45 copy.doc = NULL;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	46 return PyMember_GetOne(addr, &copy);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	47 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	48 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	49 PyErr_SetString(PyExc_AttributeError, name);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	50 return NULL;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	51 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	52
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	53 PyObject *
36114 e9a10f74cf88 const poisoning, spreading to fix new const warnings Tim Peters <tim.peters@gmail.com> parents: 34677 diff changeset	54 PyMember_GetOne(const char addr, PyMemberDef l)
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	55 {
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	56 PyObject *v;
41715 f60c877d52c8 Merged revisions 55270-55324 via svnmerge from Guido van Rossum <guido@python.org> parents: 41317 diff changeset	57
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	58 addr += l->offset;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	59 switch (l->type) {
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	60 case T_BYTE:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	61 v = PyInt_FromLong((char)addr);
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	62 break;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	63 case T_UBYTE:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	64 v = PyLong_FromUnsignedLong((unsigned char)addr);
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	65 break;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	66 case T_SHORT:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	67 v = PyInt_FromLong((short)addr);
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	68 break;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	69 case T_USHORT:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	70 v = PyLong_FromUnsignedLong((unsigned short)addr);
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	71 break;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	72 case T_INT:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	73 v = PyInt_FromLong((int)addr);
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	74 break;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	75 case T_UINT:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	76 v = PyLong_FromUnsignedLong((unsigned int)addr);
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	77 break;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	78 case T_LONG:
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	79 v = PyInt_FromLong((long)addr);
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	80 break;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	81 case T_ULONG:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	82 v = PyLong_FromUnsignedLong((unsigned long)addr);
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	83 break;
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	84 case T_PYSSIZET:
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	85 v = PyInt_FromSsize_t((Py_ssize_t)addr);
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	86 break;
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	87 case T_FLOAT:
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	88 v = PyFloat_FromDouble((double)(float)addr);
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	89 break;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	90 case T_DOUBLE:
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	91 v = PyFloat_FromDouble((double)addr);
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	92 break;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	93 case T_STRING:
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	94 if ((char*)addr == NULL) {
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	95 Py_INCREF(Py_None);
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	96 v = Py_None;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	97 }
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	98 else
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	99 v = PyString_FromString((char*)addr);
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	100 break;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	101 case T_STRING_INPLACE:
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	102 v = PyString_FromString((char*)addr);
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	103 break;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	104 case T_CHAR:
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	105 v = PyString_FromStringAndSize((char*)addr, 1);
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	106 break;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	107 case T_OBJECT:
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	108 v = (PyObject *)addr;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	109 if (v == NULL)
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	110 v = Py_None;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	111 Py_INCREF(v);
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	112 break;
21187 ef6f692c76e2 Fix SF bug #486144: Uninitialized __slot__ vrbl is None. Guido van Rossum <guido@python.org> parents: 20456 diff changeset	113 case T_OBJECT_EX:
ef6f692c76e2 Fix SF bug #486144: Uninitialized __slot__ vrbl is None. Guido van Rossum <guido@python.org> parents: 20456 diff changeset	114 v = (PyObject *)addr;
ef6f692c76e2 Fix SF bug #486144: Uninitialized __slot__ vrbl is None. Guido van Rossum <guido@python.org> parents: 20456 diff changeset	115 if (v == NULL)
ef6f692c76e2 Fix SF bug #486144: Uninitialized __slot__ vrbl is None. Guido van Rossum <guido@python.org> parents: 20456 diff changeset	116 PyErr_SetString(PyExc_AttributeError, l->name);
ef6f692c76e2 Fix SF bug #486144: Uninitialized __slot__ vrbl is None. Guido van Rossum <guido@python.org> parents: 20456 diff changeset	117 Py_XINCREF(v);
ef6f692c76e2 Fix SF bug #486144: Uninitialized __slot__ vrbl is None. Guido van Rossum <guido@python.org> parents: 20456 diff changeset	118 break;
34677 e9ffad6d8822 Patch #1115086: support PY_LONGLONG in structmember. Martin v. Löwis <martin@v.loewis.de> parents: 30979 diff changeset	119 #ifdef HAVE_LONG_LONG
e9ffad6d8822 Patch #1115086: support PY_LONGLONG in structmember. Martin v. Löwis <martin@v.loewis.de> parents: 30979 diff changeset	120 case T_LONGLONG:
e9ffad6d8822 Patch #1115086: support PY_LONGLONG in structmember. Martin v. Löwis <martin@v.loewis.de> parents: 30979 diff changeset	121 v = PyLong_FromLongLong((PY_LONG_LONG )addr);
e9ffad6d8822 Patch #1115086: support PY_LONGLONG in structmember. Martin v. Löwis <martin@v.loewis.de> parents: 30979 diff changeset	122 break;
e9ffad6d8822 Patch #1115086: support PY_LONGLONG in structmember. Martin v. Löwis <martin@v.loewis.de> parents: 30979 diff changeset	123 case T_ULONGLONG:
e9ffad6d8822 Patch #1115086: support PY_LONGLONG in structmember. Martin v. Löwis <martin@v.loewis.de> parents: 30979 diff changeset	124 v = PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG )addr);
e9ffad6d8822 Patch #1115086: support PY_LONGLONG in structmember. Martin v. Löwis <martin@v.loewis.de> parents: 30979 diff changeset	125 break;
e9ffad6d8822 Patch #1115086: support PY_LONGLONG in structmember. Martin v. Löwis <martin@v.loewis.de> parents: 30979 diff changeset	126 #endif /* HAVE_LONG_LONG */
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 38453 diff changeset	127 case T_NONE:
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 38453 diff changeset	128 v = Py_None;
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 38453 diff changeset	129 Py_INCREF(v);
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 38453 diff changeset	130 break;
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	131 default:
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	132 PyErr_SetString(PyExc_SystemError, "bad memberdescr type");
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	133 v = NULL;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	134 }
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	135 return v;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	136 }
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	137
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	138 int
36114 e9a10f74cf88 const poisoning, spreading to fix new const warnings Tim Peters <tim.peters@gmail.com> parents: 34677 diff changeset	139 PyMember_Set(char addr, struct memberlist mlist, const char name, PyObject v)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	140 {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	141 struct memberlist *l;
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	142
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	143 for (l = mlist; l->name != NULL; l++) {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	144 if (strcmp(l->name, name) == 0) {
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	145 PyMemberDef copy;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	146 copy.name = l->name;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	147 copy.type = l->type;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	148 copy.offset = l->offset;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	149 copy.flags = l->flags;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	150 copy.doc = NULL;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	151 return PyMember_SetOne(addr, &copy, v);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	152 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	153 }
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	154
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5287 diff changeset	155 PyErr_SetString(PyExc_AttributeError, name);
95 a5bf7d5959ce Return -1 for errors. Guido van Rossum <guido@python.org> parents: 86 diff changeset	156 return -1;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	157 }
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	158
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	159 int
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	160 PyMember_SetOne(char addr, PyMemberDef l, PyObject *v)
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	161 {
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	162 PyObject *oldv;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	163
30979 86fdf8fe7f17 Getting rid of all the code inside #ifdef macintosh too. Jack Jansen <jack.jansen@cwi.nl> parents: 21187 diff changeset	164 if ((l->flags & READONLY) \|\| l->type == T_STRING)
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	165 {
41317 b897b77a004f Make readonly members defined in C throw an AttributeError on modification. This brings them into sync with Python-level attributes. Fixes bug #1687163. Collin Winter <collinw@gmail.com> parents: 40450 diff changeset	166 PyErr_SetString(PyExc_AttributeError, "readonly attribute");
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	167 return -1;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	168 }
21187 ef6f692c76e2 Fix SF bug #486144: Uninitialized __slot__ vrbl is None. Guido van Rossum <guido@python.org> parents: 20456 diff changeset	169 if (v == NULL && l->type != T_OBJECT_EX && l->type != T_OBJECT) {
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	170 PyErr_SetString(PyExc_TypeError,
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	171 "can't delete numeric/char attribute");
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	172 return -1;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	173 }
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	174 addr += l->offset;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	175 switch (l->type) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	176 case T_BYTE:{
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	177 long long_val;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	178 long_val = PyInt_AsLong(v);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	179 if ((long_val == -1) && PyErr_Occurred())
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	180 return -1;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	181 /* XXX: For compatibility, only warn about truncations
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	182 for now. */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	183 if ((long_val > CHAR_MAX) \|\| (long_val < CHAR_MIN))
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	184 PyErr_Warn(PyExc_RuntimeWarning, "Truncation of value to char");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	185 (char)addr = (char)long_val;
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	186 break;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	187 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	188 case T_UBYTE:{
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	189 long long_val;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	190 long_val = PyInt_AsLong(v);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	191 if ((long_val == -1) && PyErr_Occurred())
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	192 return -1;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	193 if ((long_val > UCHAR_MAX) \|\| (long_val < 0))
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	194 PyErr_Warn(PyExc_RuntimeWarning, "Truncation of value to unsigned char");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	195 (unsigned char)addr = (unsigned char)long_val;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	196 break;
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	197 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	198 case T_SHORT:{
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	199 long long_val;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	200 long_val = PyInt_AsLong(v);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	201 if ((long_val == -1) && PyErr_Occurred())
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	202 return -1;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	203 if ((long_val > SHRT_MAX) \|\| (long_val < SHRT_MIN))
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	204 PyErr_Warn(PyExc_RuntimeWarning, "Truncation of value to short");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	205 (short)addr = (short)long_val;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	206 break;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	207 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	208 case T_USHORT:{
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	209 long long_val;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	210 long_val = PyInt_AsLong(v);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	211 if ((long_val == -1) && PyErr_Occurred())
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	212 return -1;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	213 if ((long_val > USHRT_MAX) \|\| (long_val < 0))
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	214 PyErr_Warn(PyExc_RuntimeWarning, "Truncation of value to unsigned short");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	215 (unsigned short)addr = (unsigned short)long_val;
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	216 break;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	217 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	218 case T_INT:{
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	219 long long_val;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	220 long_val = PyInt_AsLong(v);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	221 if ((long_val == -1) && PyErr_Occurred())
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	222 return -1;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	223 if ((long_val > INT_MAX) \|\| (long_val < INT_MIN))
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	224 PyErr_Warn(PyExc_RuntimeWarning, "Truncation of value to int");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	225 (int )addr = (int)long_val;
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	226 break;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	227 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	228 case T_UINT:{
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	229 unsigned long ulong_val;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	230 ulong_val = PyLong_AsUnsignedLong(v);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	231 if ((ulong_val == (unsigned int)-1) && PyErr_Occurred()) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	232 /* XXX: For compatibility, accept negative int values
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	233 as well. */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	234 PyErr_Clear();
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	235 ulong_val = PyLong_AsLong(v);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	236 if ((ulong_val == (unsigned int)-1) && PyErr_Occurred())
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	237 return -1;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	238 PyErr_Warn(PyExc_RuntimeWarning, "Writing negative value into unsigned field");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	239 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	240 if (ulong_val > UINT_MAX)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	241 PyErr_Warn(PyExc_RuntimeWarning, "Truncation of value to unsigned int");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	242 (unsigned int )addr = (unsigned int)ulong_val;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	243 break;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	244 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	245 case T_LONG:{
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	246 (long)addr = PyLong_AsLong(v);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	247 if (((long)addr == -1) && PyErr_Occurred())
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	248 return -1;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	249 break;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	250 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	251 case T_ULONG:{
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	252 (unsigned long)addr = PyLong_AsUnsignedLong(v);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	253 if (((unsigned long)addr == (unsigned long)-1)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	254 && PyErr_Occurred()) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	255 /* XXX: For compatibility, accept negative int values
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	256 as well. */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	257 PyErr_Clear();
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	258 (unsigned long)addr = PyLong_AsLong(v);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	259 if (((unsigned long)addr == (unsigned int)-1) && PyErr_Occurred())
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	260 return -1;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	261 PyErr_Warn(PyExc_RuntimeWarning, "Writing negative value into unsigned field");
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	262 }
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	263 break;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	264 }
42110 e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	265 case T_PYSSIZET:{
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	266 (Py_ssize_t)addr = PyInt_AsSsize_t(v);
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	267 if (((Py_ssize_t)addr == (Py_ssize_t)-1)
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	268 && PyErr_Occurred())
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	269 return -1;
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	270 break;
e4f649c4f457 Merged revisions 55962-56019 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	271 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	272 case T_FLOAT:{
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	273 double double_val;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	274 double_val = PyFloat_AsDouble(v);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	275 if ((double_val == -1) && PyErr_Occurred())
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	276 return -1;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	277 (float)addr = (float)double_val;
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	278 break;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	279 }
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	280 case T_DOUBLE:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	281 (double)addr = PyFloat_AsDouble(v);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39536 diff changeset	282 if (((double)addr == -1) && PyErr_Occurred())
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	283 return -1;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	284 break;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	285 case T_OBJECT:
21187 ef6f692c76e2 Fix SF bug #486144: Uninitialized __slot__ vrbl is None. Guido van Rossum <guido@python.org> parents: 20456 diff changeset	286 case T_OBJECT_EX:
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	287 Py_XINCREF(v);
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	288 oldv = (PyObject *)addr;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	289 (PyObject *)addr = v;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	290 Py_XDECREF(oldv);
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	291 break;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	292 case T_CHAR:
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	293 if (PyString_Check(v) && PyString_Size(v) == 1) {
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	294 (char)addr = PyString_AsString(v)[0];
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	295 }
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	296 else {
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	297 PyErr_BadArgument();
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	298 return -1;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	299 }
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	300 break;
34677 e9ffad6d8822 Patch #1115086: support PY_LONGLONG in structmember. Martin v. Löwis <martin@v.loewis.de> parents: 30979 diff changeset	301 #ifdef HAVE_LONG_LONG
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	302 case T_LONGLONG:{
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	303 PY_LONG_LONG value;
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	304 (PY_LONG_LONG)addr = value = PyLong_AsLongLong(v);
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	305 if ((value == -1) && PyErr_Occurred())
34677 e9ffad6d8822 Patch #1115086: support PY_LONGLONG in structmember. Martin v. Löwis <martin@v.loewis.de> parents: 30979 diff changeset	306 return -1;
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	307 break;
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	308 }
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	309 case T_ULONGLONG:{
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	310 unsigned PY_LONG_LONG value;
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	311 /* ??? PyLong_AsLongLong accepts an int, but PyLong_AsUnsignedLongLong
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	312 doesn't ??? */
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	313 if (PyLong_Check(v))
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	314 (unsigned PY_LONG_LONG)addr = value = PyLong_AsUnsignedLongLong(v);
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	315 else
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	316 (unsigned PY_LONG_LONG)addr = value = PyInt_AsLong(v);
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	317 if ((value == (unsigned PY_LONG_LONG)-1) && PyErr_Occurred())
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	318 return -1;
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	319 break;
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	320 }
34677 e9ffad6d8822 Patch #1115086: support PY_LONGLONG in structmember. Martin v. Löwis <martin@v.loewis.de> parents: 30979 diff changeset	321 #endif /* HAVE_LONG_LONG */
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	322 default:
20456 bff6c2d76f33 Put descr name in "bad memberdescr type" error message. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20012 diff changeset	323 PyErr_Format(PyExc_SystemError,
bff6c2d76f33 Put descr name in "bad memberdescr type" error message. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20012 diff changeset	324 "bad memberdescr type for %s", l->name);
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	325 return -1;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	326 }
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	327 return 0;
3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 19942 diff changeset	328 }

Mercurial > cpython-lru_cache-weakref

annotate Python/structmember.c @ 42309:bd6acfdb47d2