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

annotate Python/getargs.c @ 87680:02d186e3af09 2.7

Fixed JSON tests on wide build when ran from *.pyc files (issue #11489).

author	Serhiy Storchaka <storchaka@gmail.com>
date	Sun, 01 Dec 2013 17:30:55 +0200
parents	aa804ef5a6ca
children

rev	line source
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	1
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	2 /* New getargs implementation */
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, 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: 5317 diff changeset	4 #include "Python.h"
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	5
4102 9569664ac347 Add needed #include <ctype.h> Guido van Rossum <guido@python.org> parents: 4026 diff changeset	6 #include <ctype.h>
9569664ac347 Add needed #include <ctype.h> Guido van Rossum <guido@python.org> parents: 4026 diff changeset	7
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	8
37619 f19addd69ad9 avoid C++ name mangling for the _Py.SizeT functions Anthony Baxter <anthonybaxter@gmail.com>* parents: 36773 diff changeset	9 #ifdef __cplusplus
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	10 extern "C" {
37619 f19addd69ad9 avoid C++ name mangling for the _Py.SizeT functions Anthony Baxter <anthonybaxter@gmail.com>* parents: 36773 diff changeset	11 #endif
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35552 diff changeset	12 int PyArg_Parse(PyObject , const char , ...);
9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35552 diff changeset	13 int PyArg_ParseTuple(PyObject , const char , ...);
9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35552 diff changeset	14 int PyArg_VaParse(PyObject , const char , va_list);
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	15
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13378 diff changeset	16 int PyArg_ParseTupleAndKeywords(PyObject , PyObject ,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	17 const char , char *, ...);
32606 cc1f74d19fcb Add PyArg_VaParseTupleAndKeywords(). Document this function and Brett Cannon <bcannon@gmail.com> parents: 28952 diff changeset	18 int PyArg_VaParseTupleAndKeywords(PyObject , PyObject ,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	19 const char , char *, va_list);
32606 cc1f74d19fcb Add PyArg_VaParseTupleAndKeywords(). Document this function and Brett Cannon <bcannon@gmail.com> parents: 28952 diff changeset	20
37702 9b22d8b7bcaa Make Py_BuildValue, PyObject_CallFunction and Martin v. Löwis <martin@v.loewis.de> parents: 37697 diff changeset	21 #ifdef HAVE_DECLSPEC_DLL
9b22d8b7bcaa Make Py_BuildValue, PyObject_CallFunction and Martin v. Löwis <martin@v.loewis.de> parents: 37697 diff changeset	22 /* Export functions */
9b22d8b7bcaa Make Py_BuildValue, PyObject_CallFunction and Martin v. Löwis <martin@v.loewis.de> parents: 37697 diff changeset	23 PyAPI_FUNC(int) _PyArg_Parse_SizeT(PyObject , char , ...);
9b22d8b7bcaa Make Py_BuildValue, PyObject_CallFunction and Martin v. Löwis <martin@v.loewis.de> parents: 37697 diff changeset	24 PyAPI_FUNC(int) _PyArg_ParseTuple_SizeT(PyObject , char , ...);
9b22d8b7bcaa Make Py_BuildValue, PyObject_CallFunction and Martin v. Löwis <martin@v.loewis.de> parents: 37697 diff changeset	25 PyAPI_FUNC(int) _PyArg_ParseTupleAndKeywords_SizeT(PyObject , PyObject ,
9b22d8b7bcaa Make Py_BuildValue, PyObject_CallFunction and Martin v. Löwis <martin@v.loewis.de> parents: 37697 diff changeset	26 const char , char *, ...);
9b22d8b7bcaa Make Py_BuildValue, PyObject_CallFunction and Martin v. Löwis <martin@v.loewis.de> parents: 37697 diff changeset	27 PyAPI_FUNC(PyObject ) _Py_BuildValue_SizeT(const char , ...);
9b22d8b7bcaa Make Py_BuildValue, PyObject_CallFunction and Martin v. Löwis <martin@v.loewis.de> parents: 37697 diff changeset	28 PyAPI_FUNC(int) _PyArg_VaParse_SizeT(PyObject , char , va_list);
9b22d8b7bcaa Make Py_BuildValue, PyObject_CallFunction and Martin v. Löwis <martin@v.loewis.de> parents: 37697 diff changeset	29 PyAPI_FUNC(int) _PyArg_VaParseTupleAndKeywords_SizeT(PyObject , PyObject ,
9b22d8b7bcaa Make Py_BuildValue, PyObject_CallFunction and Martin v. Löwis <martin@v.loewis.de> parents: 37697 diff changeset	30 const char , char *, va_list);
9b22d8b7bcaa Make Py_BuildValue, PyObject_CallFunction and Martin v. Löwis <martin@v.loewis.de> parents: 37697 diff changeset	31 #endif
9b22d8b7bcaa Make Py_BuildValue, PyObject_CallFunction and Martin v. Löwis <martin@v.loewis.de> parents: 37697 diff changeset	32
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	33 #define FLAG_COMPAT 1
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	34 #define FLAG_SIZE_T 2
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	35
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	36
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	37 /* Forward */
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35552 diff changeset	38 static int vgetargs1(PyObject , const char , va_list *, int);
9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35552 diff changeset	39 static void seterror(int, const char , int , const char , const char );
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	40 static char convertitem(PyObject , const char *, va_list , int, int *,
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	41 char , size_t, PyObject *);
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	42 static char converttuple(PyObject , const char *, va_list , int,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	43 int , char , size_t, int, PyObject **);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	44 static char convertsimple(PyObject , const char *, va_list , int, char *,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	45 size_t, PyObject **);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	46 static Py_ssize_t convertbuffer(PyObject , void p, char *);
48221 b8c4bf393794 Issue #3139: Make buffer-interface thread-safe wrt. PyArg_ParseTuple, Martin v. Löwis <martin@v.loewis.de> parents: 47527 diff changeset	47 static int getbuffer(PyObject , Py_buffer , char**);
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	48
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13378 diff changeset	49 static int vgetargskeywords(PyObject , PyObject ,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	50 const char , char , va_list , int);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	51 static char skipitem(const char , va_list , int);
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	52
20629 acc7e3b4d042 Style conformance: function name begins a new line consistently. Fred Drake <fdrake@acm.org> parents: 20371 diff changeset	53 int
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35552 diff changeset	54 PyArg_Parse(PyObject args, const char format, ...)
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	55 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	56 int retval;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	57 va_list va;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	58
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	59 va_start(va, format);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	60 retval = vgetargs1(args, format, &va, FLAG_COMPAT);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	61 va_end(va);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	62 return retval;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	63 }
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	64
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	65 int
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	66 _PyArg_Parse_SizeT(PyObject args, char format, ...)
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	67 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	68 int retval;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	69 va_list va;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	70
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	71 va_start(va, format);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	72 retval = vgetargs1(args, format, &va, FLAG_COMPAT\|FLAG_SIZE_T);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	73 va_end(va);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	74 return retval;
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	75 }
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	76
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	77
20629 acc7e3b4d042 Style conformance: function name begins a new line consistently. Fred Drake <fdrake@acm.org> parents: 20371 diff changeset	78 int
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35552 diff changeset	79 PyArg_ParseTuple(PyObject args, const char format, ...)
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	80 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	81 int retval;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	82 va_list va;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	83
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	84 va_start(va, format);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	85 retval = vgetargs1(args, format, &va, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	86 va_end(va);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	87 return retval;
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	88 }
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	89
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	90 int
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	91 _PyArg_ParseTuple_SizeT(PyObject args, char format, ...)
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	92 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	93 int retval;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	94 va_list va;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	95
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	96 va_start(va, format);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	97 retval = vgetargs1(args, format, &va, FLAG_SIZE_T);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	98 va_end(va);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	99 return retval;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	100 }
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	101
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	102
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	103 int
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35552 diff changeset	104 PyArg_VaParse(PyObject args, const char format, va_list va)
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	105 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	106 va_list lva;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2004 diff changeset	107
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2004 diff changeset	108 #ifdef VA_LIST_IS_ARRAY
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	109 memcpy(lva, va, sizeof(va_list));
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2004 diff changeset	110 #else
24400 81ca6ca5c307 Patch #554716: Use __va_copy where available. Martin v. Löwis <martin@v.loewis.de> parents: 22801 diff changeset	111 #ifdef __va_copy
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	112 __va_copy(lva, va);
24400 81ca6ca5c307 Patch #554716: Use __va_copy where available. Martin v. Löwis <martin@v.loewis.de> parents: 22801 diff changeset	113 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	114 lva = va;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2004 diff changeset	115 #endif
24400 81ca6ca5c307 Patch #554716: Use __va_copy where available. Martin v. Löwis <martin@v.loewis.de> parents: 22801 diff changeset	116 #endif
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 2004 diff changeset	117
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	118 return vgetargs1(args, format, &lva, 0);
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	119 }
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	120
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	121 int
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	122 _PyArg_VaParse_SizeT(PyObject args, char format, va_list va)
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	123 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	124 va_list lva;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	125
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	126 #ifdef VA_LIST_IS_ARRAY
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	127 memcpy(lva, va, sizeof(va_list));
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	128 #else
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	129 #ifdef __va_copy
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	130 __va_copy(lva, va);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	131 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	132 lva = va;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	133 #endif
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	134 #endif
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	135
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	136 return vgetargs1(args, format, &lva, FLAG_SIZE_T);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	137 }
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	138
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	139
28952 6c4a04ce965c Patch #684981: Add cleanup capability for argument parsers. Fixes 501716. Martin v. Löwis <martin@v.loewis.de> parents: 28667 diff changeset	140 /* Handle cleanup of allocated memory in case of exception */
6c4a04ce965c Patch #684981: Add cleanup capability for argument parsers. Fixes 501716. Martin v. Löwis <martin@v.loewis.de> parents: 28667 diff changeset	141
59998 d11fbc796499 Backported PyCapsule from 3.1, and converted most uses of Larry Hastings <larry@hastings.org> parents: 58070 diff changeset	142 #define GETARGS_CAPSULE_NAME_CLEANUP_PTR "getargs.cleanup_ptr"
d11fbc796499 Backported PyCapsule from 3.1, and converted most uses of Larry Hastings <larry@hastings.org> parents: 58070 diff changeset	143 #define GETARGS_CAPSULE_NAME_CLEANUP_BUFFER "getargs.cleanup_buffer"
d11fbc796499 Backported PyCapsule from 3.1, and converted most uses of Larry Hastings <larry@hastings.org> parents: 58070 diff changeset	144
48889 bbffe0914c56 #3668: When PyArg_ParseTuple correctly parses a s* format, but raises an Antoine Pitrou <solipsis@pitrou.net> parents: 48847 diff changeset	145 static void
59998 d11fbc796499 Backported PyCapsule from 3.1, and converted most uses of Larry Hastings <larry@hastings.org> parents: 58070 diff changeset	146 cleanup_ptr(PyObject *self)
48889 bbffe0914c56 #3668: When PyArg_ParseTuple correctly parses a s* format, but raises an Antoine Pitrou <solipsis@pitrou.net> parents: 48847 diff changeset	147 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	148 void *ptr = PyCapsule_GetPointer(self, GETARGS_CAPSULE_NAME_CLEANUP_PTR);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	149 if (ptr) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	150 PyMem_FREE(ptr);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	151 }
48889 bbffe0914c56 #3668: When PyArg_ParseTuple correctly parses a s* format, but raises an Antoine Pitrou <solipsis@pitrou.net> parents: 48847 diff changeset	152 }
bbffe0914c56 #3668: When PyArg_ParseTuple correctly parses a s* format, but raises an Antoine Pitrou <solipsis@pitrou.net> parents: 48847 diff changeset	153
bbffe0914c56 #3668: When PyArg_ParseTuple correctly parses a s* format, but raises an Antoine Pitrou <solipsis@pitrou.net> parents: 48847 diff changeset	154 static void
59998 d11fbc796499 Backported PyCapsule from 3.1, and converted most uses of Larry Hastings <larry@hastings.org> parents: 58070 diff changeset	155 cleanup_buffer(PyObject *self)
48889 bbffe0914c56 #3668: When PyArg_ParseTuple correctly parses a s* format, but raises an Antoine Pitrou <solipsis@pitrou.net> parents: 48847 diff changeset	156 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	157 Py_buffer ptr = (Py_buffer )PyCapsule_GetPointer(self, GETARGS_CAPSULE_NAME_CLEANUP_BUFFER);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	158 if (ptr) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	159 PyBuffer_Release(ptr);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	160 }
48889 bbffe0914c56 #3668: When PyArg_ParseTuple correctly parses a s* format, but raises an Antoine Pitrou <solipsis@pitrou.net> parents: 48847 diff changeset	161 }
bbffe0914c56 #3668: When PyArg_ParseTuple correctly parses a s* format, but raises an Antoine Pitrou <solipsis@pitrou.net> parents: 48847 diff changeset	162
28952 6c4a04ce965c Patch #684981: Add cleanup capability for argument parsers. Fixes 501716. Martin v. Löwis <martin@v.loewis.de> parents: 28667 diff changeset	163 static int
59998 d11fbc796499 Backported PyCapsule from 3.1, and converted most uses of Larry Hastings <larry@hastings.org> parents: 58070 diff changeset	164 addcleanup(void ptr, PyObject *freelist, PyCapsule_Destructor destr)
28952 6c4a04ce965c Patch #684981: Add cleanup capability for argument parsers. Fixes 501716. Martin v. Löwis <martin@v.loewis.de> parents: 28667 diff changeset	165 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	166 PyObject *cobj;
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	167 const char *name;
59998 d11fbc796499 Backported PyCapsule from 3.1, and converted most uses of Larry Hastings <larry@hastings.org> parents: 58070 diff changeset	168
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	169 if (!*freelist) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	170 *freelist = PyList_New(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	171 if (!*freelist) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	172 destr(ptr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	173 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	174 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	175 }
59998 d11fbc796499 Backported PyCapsule from 3.1, and converted most uses of Larry Hastings <larry@hastings.org> parents: 58070 diff changeset	176
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	177 if (destr == cleanup_ptr) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	178 name = GETARGS_CAPSULE_NAME_CLEANUP_PTR;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	179 } else if (destr == cleanup_buffer) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	180 name = GETARGS_CAPSULE_NAME_CLEANUP_BUFFER;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	181 } else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	182 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	183 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	184 cobj = PyCapsule_New(ptr, name, destr);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	185 if (!cobj) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	186 destr(ptr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	187 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	188 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	189 if (PyList_Append(*freelist, cobj)) {
28952 6c4a04ce965c Patch #684981: Add cleanup capability for argument parsers. Fixes 501716. Martin v. Löwis <martin@v.loewis.de> parents: 28667 diff changeset	190 Py_DECREF(cobj);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	191 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	192 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	193 Py_DECREF(cobj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	194 return 0;
28952 6c4a04ce965c Patch #684981: Add cleanup capability for argument parsers. Fixes 501716. Martin v. Löwis <martin@v.loewis.de> parents: 28667 diff changeset	195 }
6c4a04ce965c Patch #684981: Add cleanup capability for argument parsers. Fixes 501716. Martin v. Löwis <martin@v.loewis.de> parents: 28667 diff changeset	196
6c4a04ce965c Patch #684981: Add cleanup capability for argument parsers. Fixes 501716. Martin v. Löwis <martin@v.loewis.de> parents: 28667 diff changeset	197 static int
6c4a04ce965c Patch #684981: Add cleanup capability for argument parsers. Fixes 501716. Martin v. Löwis <martin@v.loewis.de> parents: 28667 diff changeset	198 cleanreturn(int retval, PyObject *freelist)
6c4a04ce965c Patch #684981: Add cleanup capability for argument parsers. Fixes 501716. Martin v. Löwis <martin@v.loewis.de> parents: 28667 diff changeset	199 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	200 if (freelist && retval != 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	201 /* We were successful, reset the destructors so that they
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	202 don't get called. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	203 Py_ssize_t len = PyList_GET_SIZE(freelist), i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	204 for (i = 0; i < len; i++)
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	205 PyCapsule_SetDestructor(PyList_GET_ITEM(freelist, i), NULL);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	206 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	207 Py_XDECREF(freelist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	208 return retval;
28952 6c4a04ce965c Patch #684981: Add cleanup capability for argument parsers. Fixes 501716. Martin v. Löwis <martin@v.loewis.de> parents: 28667 diff changeset	209 }
6c4a04ce965c Patch #684981: Add cleanup capability for argument parsers. Fixes 501716. Martin v. Löwis <martin@v.loewis.de> parents: 28667 diff changeset	210
6c4a04ce965c Patch #684981: Add cleanup capability for argument parsers. Fixes 501716. Martin v. Löwis <martin@v.loewis.de> parents: 28667 diff changeset	211
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	212 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	213 vgetargs1(PyObject args, const char format, va_list *p_va, int flags)
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	214 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	215 char msgbuf[256];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	216 int levels[32];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	217 const char *fname = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	218 const char *message = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	219 int min = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	220 int max = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	221 int level = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	222 int endfmt = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	223 const char *formatsave = format;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	224 Py_ssize_t i, len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	225 char *msg;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	226 PyObject *freelist = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	227 int compat = flags & FLAG_COMPAT;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	228
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	229 assert(compat \|\| (args != (PyObject*)NULL));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	230 flags = flags & ~FLAG_COMPAT;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	231
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	232 while (endfmt == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	233 int c = *format++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	234 switch (c) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	235 case '(':
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	236 if (level == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	237 max++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	238 level++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	239 if (level >= 30)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	240 Py_FatalError("too many tuple nesting levels "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	241 "in argument format string");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	242 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	243 case ')':
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	244 if (level == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	245 Py_FatalError("excess ')' in getargs format");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	246 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	247 level--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	248 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	249 case '\0':
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	250 endfmt = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	251 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	252 case ':':
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	253 fname = format;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	254 endfmt = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	255 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	256 case ';':
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	257 message = format;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	258 endfmt = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	259 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	260 default:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	261 if (level == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	262 if (c == 'O')
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	263 max++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	264 else if (isalpha(Py_CHARMASK(c))) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	265 if (c != 'e') /* skip encoded */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	266 max++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	267 } else if (c == '\|')
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	268 min = max;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	269 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	270 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	271 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	272 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	273
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	274 if (level != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	275 Py_FatalError(/* '(' */ "missing ')' in getargs format");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	276
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	277 if (min < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	278 min = max;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	279
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	280 format = formatsave;
16582 9a8e961b505f Related to SF bug 132008 (PyList_Reverse blows up). Tim Peters <tim.peters@gmail.com> parents: 16264 diff changeset	281
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	282 if (compat) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	283 if (max == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	284 if (args == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	285 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	286 PyOS_snprintf(msgbuf, sizeof(msgbuf),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	287 "%.200s%s takes no arguments",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	288 fname==NULL ? "function" : fname,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	289 fname==NULL ? "" : "()");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	290 PyErr_SetString(PyExc_TypeError, msgbuf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	291 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	292 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	293 else if (min == 1 && max == 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	294 if (args == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	295 PyOS_snprintf(msgbuf, sizeof(msgbuf),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	296 "%.200s%s takes at least one argument",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	297 fname==NULL ? "function" : fname,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	298 fname==NULL ? "" : "()");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	299 PyErr_SetString(PyExc_TypeError, msgbuf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	300 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	301 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	302 msg = convertitem(args, &format, p_va, flags, levels,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	303 msgbuf, sizeof(msgbuf), &freelist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	304 if (msg == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	305 return cleanreturn(1, freelist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	306 seterror(levels[0], msg, levels+1, fname, message);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	307 return cleanreturn(0, freelist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	308 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	309 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	310 PyErr_SetString(PyExc_SystemError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	311 "old style getargs format uses new features");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	312 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	313 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	314 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	315
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	316 if (!PyTuple_Check(args)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	317 PyErr_SetString(PyExc_SystemError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	318 "new style getargs format but argument is not a tuple");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	319 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	320 }
6805 93e480dedcf0 Add explicit check for correct next character in format at end of Guido van Rossum <guido@python.org> parents: 5410 diff changeset	321
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	322 len = PyTuple_GET_SIZE(args);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	323
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	324 if (len < min \|\| max < len) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	325 if (message == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	326 PyOS_snprintf(msgbuf, sizeof(msgbuf),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	327 "%.150s%s takes %s %d argument%s "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	328 "(%ld given)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	329 fname==NULL ? "function" : fname,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	330 fname==NULL ? "" : "()",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	331 min==max ? "exactly"
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	332 : len < min ? "at least" : "at most",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	333 len < min ? min : max,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	334 (len < min ? min : max) == 1 ? "" : "s",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	335 Py_SAFE_DOWNCAST(len, Py_ssize_t, long));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	336 message = msgbuf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	337 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	338 PyErr_SetString(PyExc_TypeError, message);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	339 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	340 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	341
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	342 for (i = 0; i < len; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	343 if (*format == '\|')
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	344 format++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	345 msg = convertitem(PyTuple_GET_ITEM(args, i), &format, p_va,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	346 flags, levels, msgbuf,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	347 sizeof(msgbuf), &freelist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	348 if (msg) {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	349 seterror(i+1, msg, levels, fname, msg);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	350 return cleanreturn(0, freelist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	351 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	352 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	353
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	354 if (format != '\0' && !isalpha(Py_CHARMASK(format)) &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	355 *format != '(' &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	356 format != '\|' && format != ':' && *format != ';') {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	357 PyErr_Format(PyExc_SystemError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	358 "bad format string: %.200s", formatsave);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	359 return cleanreturn(0, freelist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	360 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	361
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	362 return cleanreturn(1, freelist);
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	363 }
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	364
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	365
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	366
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	367 static void
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35552 diff changeset	368 seterror(int iarg, const char msg, int levels, const char *fname,
9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35552 diff changeset	369 const char *message)
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	370 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	371 char buf[512];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	372 int i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	373 char *p = buf;
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	374
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	375 if (PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	376 return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	377 else if (message == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	378 if (fname != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	379 PyOS_snprintf(p, sizeof(buf), "%.200s() ", fname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	380 p += strlen(p);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	381 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	382 if (iarg != 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	383 PyOS_snprintf(p, sizeof(buf) - (p - buf),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	384 "argument %d", iarg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	385 i = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	386 p += strlen(p);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	387 while (levels[i] > 0 && i < 32 && (int)(p-buf) < 220) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	388 PyOS_snprintf(p, sizeof(buf) - (p - buf),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	389 ", item %d", levels[i]-1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	390 p += strlen(p);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	391 i++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	392 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	393 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	394 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	395 PyOS_snprintf(p, sizeof(buf) - (p - buf), "argument");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	396 p += strlen(p);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	397 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	398 PyOS_snprintf(p, sizeof(buf) - (p - buf), " %.256s", msg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	399 message = buf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	400 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	401 PyErr_SetString(PyExc_TypeError, message);
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	402 }
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	403
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	404
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	405 /* Convert a tuple argument.
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	406 On entry, *p_format points to the character _after_ the opening '('.
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	407 On successful exit, *p_format points to the closing ')'.
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	408 If successful:
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	409 p_format and p_va are updated,
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	410 levels and msgbuf are untouched,
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	411 and NULL is returned.
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	412 If the argument is invalid:
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	413 *p_format is unchanged,
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	414 *p_va is undefined,
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	415 *levels is a 0-terminated list of item numbers,
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	416 *msgbuf contains an error message, whose format is:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	417 "must be <typename1>, not <typename2>", where:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	418 <typename1> is the name of the expected type, and
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	419 <typename2> is the name of the actual type,
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	420 and msgbuf is returned.
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	421 */
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	422
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	423 static char *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	424 converttuple(PyObject arg, const char p_format, va_list p_va, int flags,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	425 int levels, char msgbuf, size_t bufsize, int toplevel,
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	426 PyObject **freelist)
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	427 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	428 int level = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	429 int n = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	430 const char format = p_format;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	431 int i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	432
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	433 for (;;) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	434 int c = *format++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	435 if (c == '(') {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	436 if (level == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	437 n++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	438 level++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	439 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	440 else if (c == ')') {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	441 if (level == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	442 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	443 level--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	444 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	445 else if (c == ':' \|\| c == ';' \|\| c == '\0')
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	446 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	447 else if (level == 0 && isalpha(Py_CHARMASK(c)))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	448 n++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	449 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	450
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	451 if (!PySequence_Check(arg) \|\| PyString_Check(arg)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	452 levels[0] = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	453 PyOS_snprintf(msgbuf, bufsize,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	454 toplevel ? "expected %d arguments, not %.50s" :
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	455 "must be %d-item sequence, not %.50s",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	456 n,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	457 arg == Py_None ? "None" : arg->ob_type->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	458 return msgbuf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	459 }
15899 152814f6cd11 This patch makes sure that the function name always appears in the error Ka-Ping Yee <ping@zesty.ca> parents: 15502 diff changeset	460
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	461 if ((i = PySequence_Size(arg)) != n) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	462 levels[0] = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	463 PyOS_snprintf(msgbuf, bufsize,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	464 toplevel ? "expected %d arguments, not %d" :
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	465 "must be sequence of length %d, not %d",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	466 n, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	467 return msgbuf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	468 }
15899 152814f6cd11 This patch makes sure that the function name always appears in the error Ka-Ping Yee <ping@zesty.ca> parents: 15502 diff changeset	469
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	470 format = *p_format;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	471 for (i = 0; i < n; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	472 char *msg;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	473 PyObject *item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	474 item = PySequence_GetItem(arg, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	475 if (item == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	476 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	477 levels[0] = i+1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	478 levels[1] = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	479 strncpy(msgbuf, "is not retrievable", bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	480 return msgbuf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	481 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	482 msg = convertitem(item, &format, p_va, flags, levels+1,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	483 msgbuf, bufsize, freelist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	484 /* PySequence_GetItem calls tp->sq_item, which INCREFs */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	485 Py_XDECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	486 if (msg != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	487 levels[0] = i+1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	488 return msg;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	489 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	490 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	491
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	492 *p_format = format;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	493 return NULL;
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	494 }
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	495
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	496
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	497 /* Convert a single item. */
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	498
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	499 static char *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	500 convertitem(PyObject arg, const char p_format, va_list p_va, int flags,
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	501 int levels, char msgbuf, size_t bufsize, PyObject **freelist)
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	502 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	503 char *msg;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	504 const char format = p_format;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	505
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	506 if (format == '(' / ')' */) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	507 format++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	508 msg = converttuple(arg, &format, p_va, flags, levels, msgbuf,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	509 bufsize, 0, freelist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	510 if (msg == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	511 format++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	512 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	513 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	514 msg = convertsimple(arg, &format, p_va, flags,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	515 msgbuf, bufsize, freelist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	516 if (msg != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	517 levels[0] = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	518 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	519 if (msg == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	520 *p_format = format;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	521 return msg;
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	522 }
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	523
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	524
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	525
17996 5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	526 #define UNICODE_DEFAULT_ENCODING(arg) \
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	527 _PyUnicode_AsDefaultEncodedString(arg, NULL)
17996 5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	528
5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	529 /* Format an error message generated by convertsimple(). */
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	530
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	531 static char *
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35552 diff changeset	532 converterr(const char expected, PyObject arg, char *msgbuf, size_t bufsize)
17996 5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	533 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	534 assert(expected != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	535 assert(arg != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	536 PyOS_snprintf(msgbuf, bufsize,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	537 "must be %.50s, not %.50s", expected,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	538 arg == Py_None ? "None" : arg->ob_type->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	539 return msgbuf;
17996 5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	540 }
5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	541
5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	542 #define CONV_UNICODE "(unicode conversion error)"
5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	543
27685 9e47f9ed49f6 If a float is passed where a int is expected, issue a DeprecationWarning Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 27363 diff changeset	544 /* explicitly check for float arguments when integers are expected. For now
9e47f9ed49f6 If a float is passed where a int is expected, issue a DeprecationWarning Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 27363 diff changeset	545 * signal a warning. Returns true if an exception was raised. */
9e47f9ed49f6 If a float is passed where a int is expected, issue a DeprecationWarning Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 27363 diff changeset	546 static int
58070 2de24bb33cc5 Issue #5080: turn the DeprecationWarning from float arguments passed Mark Dickinson <dickinsm@gmail.com> parents: 55514 diff changeset	547 float_argument_warning(PyObject *arg)
27685 9e47f9ed49f6 If a float is passed where a int is expected, issue a DeprecationWarning Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 27363 diff changeset	548 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	549 if (PyFloat_Check(arg) &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	550 PyErr_Warn(PyExc_DeprecationWarning,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	551 "integer argument expected, got float" ))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	552 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	553 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	554 return 0;
27685 9e47f9ed49f6 If a float is passed where a int is expected, issue a DeprecationWarning Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 27363 diff changeset	555 }
9e47f9ed49f6 If a float is passed where a int is expected, issue a DeprecationWarning Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 27363 diff changeset	556
58070 2de24bb33cc5 Issue #5080: turn the DeprecationWarning from float arguments passed Mark Dickinson <dickinsm@gmail.com> parents: 55514 diff changeset	557 /* explicitly check for float arguments when integers are expected. Raises
2de24bb33cc5 Issue #5080: turn the DeprecationWarning from float arguments passed Mark Dickinson <dickinsm@gmail.com> parents: 55514 diff changeset	558 TypeError and returns true for float arguments. */
2de24bb33cc5 Issue #5080: turn the DeprecationWarning from float arguments passed Mark Dickinson <dickinsm@gmail.com> parents: 55514 diff changeset	559 static int
2de24bb33cc5 Issue #5080: turn the DeprecationWarning from float arguments passed Mark Dickinson <dickinsm@gmail.com> parents: 55514 diff changeset	560 float_argument_error(PyObject *arg)
2de24bb33cc5 Issue #5080: turn the DeprecationWarning from float arguments passed Mark Dickinson <dickinsm@gmail.com> parents: 55514 diff changeset	561 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	562 if (PyFloat_Check(arg)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	563 PyErr_SetString(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	564 "integer argument expected, got float");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	565 return 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	566 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	567 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	568 return 0;
58070 2de24bb33cc5 Issue #5080: turn the DeprecationWarning from float arguments passed Mark Dickinson <dickinsm@gmail.com> parents: 55514 diff changeset	569 }
2de24bb33cc5 Issue #5080: turn the DeprecationWarning from float arguments passed Mark Dickinson <dickinsm@gmail.com> parents: 55514 diff changeset	570
17996 5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	571 /* Convert a non-tuple argument. Return NULL if conversion went OK,
5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	572 or a string with a message describing the failure. The message is
5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	573 formatted as "must be <desired type>, not <actual type>".
5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	574 When failing, an exception may or may not have been raised.
35552 9b7d117eb4bc Complete format code support in getargs.c::skipitem(), which is called when Georg Brandl <georg@python.org> parents: 35449 diff changeset	575 Don't call if a tuple is expected.
9b7d117eb4bc Complete format code support in getargs.c::skipitem(), which is called when Georg Brandl <georg@python.org> parents: 35449 diff changeset	576
9b7d117eb4bc Complete format code support in getargs.c::skipitem(), which is called when Georg Brandl <georg@python.org> parents: 35449 diff changeset	577 When you add new format codes, please don't forget poor skipitem() below.
17996 5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	578 */
5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	579
5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	580 static char *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	581 convertsimple(PyObject arg, const char p_format, va_list p_va, int flags,
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35552 diff changeset	582 char msgbuf, size_t bufsize, PyObject *freelist)
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	583 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	584 /* For # codes */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	585 #define FETCH_SIZE int q=NULL;Py_ssize_t q2=NULL;\
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	586 if (flags & FLAG_SIZE_T) q2=va_arg(p_va, Py_ssize_t); \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	587 else q=va_arg(p_va, int);
69799 a0681e7a6ded Issue #8651: PyArg_Parse() functions raise an OverflowError if the file Victor Stinner <victor.stinner@haypocalc.com>* parents: 69798 diff changeset	588 #define STORE_SIZE(s) \
a0681e7a6ded Issue #8651: PyArg_Parse() functions raise an OverflowError if the file Victor Stinner <victor.stinner@haypocalc.com>* parents: 69798 diff changeset	589 if (flags & FLAG_SIZE_T) \
a0681e7a6ded Issue #8651: PyArg_Parse() functions raise an OverflowError if the file Victor Stinner <victor.stinner@haypocalc.com>* parents: 69798 diff changeset	590 *q2=s; \
a0681e7a6ded Issue #8651: PyArg_Parse() functions raise an OverflowError if the file Victor Stinner <victor.stinner@haypocalc.com>* parents: 69798 diff changeset	591 else { \
a0681e7a6ded Issue #8651: PyArg_Parse() functions raise an OverflowError if the file Victor Stinner <victor.stinner@haypocalc.com>* parents: 69798 diff changeset	592 if (INT_MAX < s) { \
a0681e7a6ded Issue #8651: PyArg_Parse() functions raise an OverflowError if the file Victor Stinner <victor.stinner@haypocalc.com>* parents: 69798 diff changeset	593 PyErr_SetString(PyExc_OverflowError, \
a0681e7a6ded Issue #8651: PyArg_Parse() functions raise an OverflowError if the file Victor Stinner <victor.stinner@haypocalc.com>* parents: 69798 diff changeset	594 "size does not fit in an int"); \
a0681e7a6ded Issue #8651: PyArg_Parse() functions raise an OverflowError if the file Victor Stinner <victor.stinner@haypocalc.com>* parents: 69798 diff changeset	595 return converterr("", arg, msgbuf, bufsize); \
a0681e7a6ded Issue #8651: PyArg_Parse() functions raise an OverflowError if the file Victor Stinner <victor.stinner@haypocalc.com>* parents: 69798 diff changeset	596 } \
a0681e7a6ded Issue #8651: PyArg_Parse() functions raise an OverflowError if the file Victor Stinner <victor.stinner@haypocalc.com>* parents: 69798 diff changeset	597 *q=s; \
a0681e7a6ded Issue #8651: PyArg_Parse() functions raise an OverflowError if the file Victor Stinner <victor.stinner@haypocalc.com>* parents: 69798 diff changeset	598 }
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	599 #define BUFFER_LEN ((flags & FLAG_SIZE_T) ? q2:q)
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	600
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	601 const char format = p_format;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	602 char c = *format++;
26321 680360e68a06 Wrap uargs declaration in a #ifdef Py_USING_UNICODE, so that Walter Dörwald <walter@livinglogic.de> parents: 24400 diff changeset	603 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	604 PyObject *uarg;
26321 680360e68a06 Wrap uargs declaration in a #ifdef Py_USING_UNICODE, so that Walter Dörwald <walter@livinglogic.de> parents: 24400 diff changeset	605 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	606
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	607 switch (c) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	608
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	609 case 'b': { /* unsigned byte -- very short int */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	610 char p = va_arg(p_va, char *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	611 long ival;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	612 if (float_argument_error(arg))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	613 return converterr("integer<b>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	614 ival = PyInt_AsLong(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	615 if (ival == -1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	616 return converterr("integer<b>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	617 else if (ival < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	618 PyErr_SetString(PyExc_OverflowError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	619 "unsigned byte integer is less than minimum");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	620 return converterr("integer<b>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	621 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	622 else if (ival > UCHAR_MAX) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	623 PyErr_SetString(PyExc_OverflowError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	624 "unsigned byte integer is greater than maximum");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	625 return converterr("integer<b>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	626 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	627 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	628 *p = (unsigned char) ival;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	629 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	630 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	631
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	632 case 'B': {/* byte sized bitfield - both signed and unsigned
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	633 values allowed */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	634 char p = va_arg(p_va, char *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	635 long ival;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	636 if (float_argument_error(arg))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	637 return converterr("integer<B>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	638 ival = PyInt_AsUnsignedLongMask(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	639 if (ival == -1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	640 return converterr("integer<B>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	641 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	642 *p = (unsigned char) ival;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	643 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	644 }
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	645
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	646 case 'h': {/* signed short int */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	647 short p = va_arg(p_va, short *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	648 long ival;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	649 if (float_argument_error(arg))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	650 return converterr("integer<h>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	651 ival = PyInt_AsLong(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	652 if (ival == -1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	653 return converterr("integer<h>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	654 else if (ival < SHRT_MIN) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	655 PyErr_SetString(PyExc_OverflowError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	656 "signed short integer is less than minimum");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	657 return converterr("integer<h>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	658 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	659 else if (ival > SHRT_MAX) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	660 PyErr_SetString(PyExc_OverflowError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	661 "signed short integer is greater than maximum");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	662 return converterr("integer<h>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	663 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	664 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	665 *p = (short) ival;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	666 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	667 }
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	668
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	669 case 'H': { /* short int sized bitfield, both signed and
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	670 unsigned allowed */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	671 unsigned short p = va_arg(p_va, unsigned short *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	672 long ival;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	673 if (float_argument_error(arg))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	674 return converterr("integer<H>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	675 ival = PyInt_AsUnsignedLongMask(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	676 if (ival == -1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	677 return converterr("integer<H>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	678 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	679 *p = (unsigned short) ival;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	680 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	681 }
17996 5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	682
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	683 case 'i': {/* signed int */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	684 int p = va_arg(p_va, int *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	685 long ival;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	686 if (float_argument_error(arg))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	687 return converterr("integer<i>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	688 ival = PyInt_AsLong(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	689 if (ival == -1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	690 return converterr("integer<i>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	691 else if (ival > INT_MAX) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	692 PyErr_SetString(PyExc_OverflowError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	693 "signed integer is greater than maximum");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	694 return converterr("integer<i>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	695 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	696 else if (ival < INT_MIN) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	697 PyErr_SetString(PyExc_OverflowError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	698 "signed integer is less than minimum");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	699 return converterr("integer<i>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	700 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	701 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	702 *p = ival;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	703 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	704 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	705
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	706 case 'I': { /* int sized bitfield, both signed and
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	707 unsigned allowed */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	708 unsigned int p = va_arg(p_va, unsigned int *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	709 unsigned int ival;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	710 if (float_argument_error(arg))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	711 return converterr("integer<I>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	712 ival = (unsigned int)PyInt_AsUnsignedLongMask(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	713 if (ival == (unsigned int)-1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	714 return converterr("integer<I>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	715 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	716 *p = ival;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	717 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	718 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	719
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	720 case 'n': /* Py_ssize_t */
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	721 #if SIZEOF_SIZE_T != SIZEOF_LONG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	722 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	723 Py_ssize_t p = va_arg(p_va, Py_ssize_t *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	724 Py_ssize_t ival;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	725 if (float_argument_error(arg))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	726 return converterr("integer<n>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	727 ival = PyInt_AsSsize_t(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	728 if (ival == -1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	729 return converterr("integer<n>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	730 *p = ival;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	731 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	732 }
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	733 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	734 /* Fall through from 'n' to 'l' if Py_ssize_t is int */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	735 case 'l': {/* long int */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	736 long p = va_arg(p_va, long *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	737 long ival;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	738 if (float_argument_error(arg))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	739 return converterr("integer<l>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	740 ival = PyInt_AsLong(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	741 if (ival == -1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	742 return converterr("integer<l>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	743 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	744 *p = ival;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	745 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	746 }
28652 28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	747
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	748 case 'k': { /* long sized bitfield */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	749 unsigned long p = va_arg(p_va, unsigned long *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	750 unsigned long ival;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	751 if (PyInt_Check(arg))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	752 ival = PyInt_AsUnsignedLongMask(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	753 else if (PyLong_Check(arg))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	754 ival = PyLong_AsUnsignedLongMask(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	755 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	756 return converterr("integer<k>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	757 *p = ival;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	758 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	759 }
28652 28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	760
9949 98e37347378b Change rare occurrences of #if HAVE_LONG_LONG to #ifdef. Guido van Rossum <guido@python.org> parents: 9306 diff changeset	761 #ifdef HAVE_LONG_LONG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	762 case 'L': {/* PY_LONG_LONG */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	763 PY_LONG_LONG p = va_arg( p_va, PY_LONG_LONG * );
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	764 PY_LONG_LONG ival;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	765 if (float_argument_warning(arg))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	766 return converterr("long<L>", arg, msgbuf, bufsize);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60395 diff changeset	767 ival = PyLong_AsLongLong(arg);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	768 if (ival == (PY_LONG_LONG)-1 && PyErr_Occurred() ) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	769 return converterr("long<L>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	770 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	771 *p = ival;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	772 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	773 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	774 }
28652 28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	775
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	776 case 'K': { /* long long sized bitfield */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	777 unsigned PY_LONG_LONG p = va_arg(p_va, unsigned PY_LONG_LONG *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	778 unsigned PY_LONG_LONG ival;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	779 if (PyInt_Check(arg))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	780 ival = PyInt_AsUnsignedLongMask(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	781 else if (PyLong_Check(arg))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	782 ival = PyLong_AsUnsignedLongLongMask(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	783 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	784 return converterr("integer<K>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	785 *p = ival;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	786 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	787 }
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8358 diff changeset	788 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	789
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	790 case 'f': {/* float */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	791 float p = va_arg(p_va, float *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	792 double dval = PyFloat_AsDouble(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	793 if (PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	794 return converterr("float<f>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	795 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	796 *p = (float) dval;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	797 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	798 }
28652 28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	799
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	800 case 'd': {/* double */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	801 double p = va_arg(p_va, double *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	802 double dval = PyFloat_AsDouble(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	803 if (PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	804 return converterr("float<d>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	805 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	806 *p = dval;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	807 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	808 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	809
3766 516490c8192c Py_complex; and WITHOUT_COMPLEX added to getargs.c Guido van Rossum <guido@python.org> parents: 3323 diff changeset	810 #ifndef WITHOUT_COMPLEX
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	811 case 'D': {/* complex double */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	812 Py_complex p = va_arg(p_va, Py_complex *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	813 Py_complex cval;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	814 cval = PyComplex_AsCComplex(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	815 if (PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	816 return converterr("complex<D>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	817 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	818 *p = cval;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	819 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	820 }
3766 516490c8192c Py_complex; and WITHOUT_COMPLEX added to getargs.c Guido van Rossum <guido@python.org> parents: 3323 diff changeset	821 #endif /* WITHOUT_COMPLEX */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	822
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	823 case 'c': {/* char */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	824 char p = va_arg(p_va, char *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	825 if (PyString_Check(arg) && PyString_Size(arg) == 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	826 *p = PyString_AS_STRING(arg)[0];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	827 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	828 return converterr("char", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	829 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	830 }
48221 b8c4bf393794 Issue #3139: Make buffer-interface thread-safe wrt. PyArg_ParseTuple, Martin v. Löwis <martin@v.loewis.de> parents: 47527 diff changeset	831
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	832 case 's': {/* string */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	833 if (format == '') {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	834 Py_buffer p = (Py_buffer )va_arg(p_va, Py_buffer );
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	835
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	836 if (PyString_Check(arg)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	837 PyBuffer_FillInfo(p, arg,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	838 PyString_AS_STRING(arg), PyString_GET_SIZE(arg),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	839 1, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	840 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18887 diff changeset	841 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	842 else if (PyUnicode_Check(arg)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	843 uarg = UNICODE_DEFAULT_ENCODING(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	844 if (uarg == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	845 return converterr(CONV_UNICODE,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	846 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	847 PyBuffer_FillInfo(p, arg,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	848 PyString_AS_STRING(uarg), PyString_GET_SIZE(uarg),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	849 1, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	850 }
48221 b8c4bf393794 Issue #3139: Make buffer-interface thread-safe wrt. PyArg_ParseTuple, Martin v. Löwis <martin@v.loewis.de> parents: 47527 diff changeset	851 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	852 else { /* any buffer-like object */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	853 char *buf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	854 if (getbuffer(arg, p, &buf) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	855 return converterr(buf, arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	856 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	857 if (addcleanup(p, freelist, cleanup_buffer)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	858 return converterr(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	859 "(cleanup problem)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	860 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	861 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	862 format++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	863 } else if (*format == '#') {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	864 void p = (void )va_arg(p_va, char *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	865 FETCH_SIZE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	866
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	867 if (PyString_Check(arg)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	868 *p = PyString_AS_STRING(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	869 STORE_SIZE(PyString_GET_SIZE(arg));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	870 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18887 diff changeset	871 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	872 else if (PyUnicode_Check(arg)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	873 uarg = UNICODE_DEFAULT_ENCODING(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	874 if (uarg == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	875 return converterr(CONV_UNICODE,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	876 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	877 *p = PyString_AS_STRING(uarg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	878 STORE_SIZE(PyString_GET_SIZE(uarg));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	879 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18887 diff changeset	880 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	881 else { /* any buffer-like object */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	882 char *buf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	883 Py_ssize_t count = convertbuffer(arg, p, &buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	884 if (count < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	885 return converterr(buf, arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	886 STORE_SIZE(count);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	887 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	888 format++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	889 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	890 char *p = va_arg(p_va, char **);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	891
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	892 if (PyString_Check(arg))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	893 *p = PyString_AS_STRING(arg);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18887 diff changeset	894 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	895 else if (PyUnicode_Check(arg)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	896 uarg = UNICODE_DEFAULT_ENCODING(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	897 if (uarg == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	898 return converterr(CONV_UNICODE,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	899 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	900 *p = PyString_AS_STRING(uarg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	901 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18887 diff changeset	902 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	903 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	904 return converterr("string", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	905 if ((Py_ssize_t)strlen(*p) != PyString_Size(arg))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	906 return converterr("string without null bytes",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	907 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	908 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	909 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	910 }
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5408 diff changeset	911
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	912 case 'z': {/* string, may be NULL (None) */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	913 if (format == '') {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	914 Py_buffer p = (Py_buffer )va_arg(p_va, Py_buffer );
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5408 diff changeset	915
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	916 if (arg == Py_None)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	917 PyBuffer_FillInfo(p, NULL, NULL, 0, 1, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	918 else if (PyString_Check(arg)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	919 PyBuffer_FillInfo(p, arg,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	920 PyString_AS_STRING(arg), PyString_GET_SIZE(arg),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	921 1, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	922 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18887 diff changeset	923 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	924 else if (PyUnicode_Check(arg)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	925 uarg = UNICODE_DEFAULT_ENCODING(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	926 if (uarg == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	927 return converterr(CONV_UNICODE,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	928 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	929 PyBuffer_FillInfo(p, arg,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	930 PyString_AS_STRING(uarg), PyString_GET_SIZE(uarg),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	931 1, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	932 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18887 diff changeset	933 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	934 else { /* any buffer-like object */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	935 char *buf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	936 if (getbuffer(arg, p, &buf) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	937 return converterr(buf, arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	938 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	939 if (addcleanup(p, freelist, cleanup_buffer)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	940 return converterr(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	941 "(cleanup problem)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	942 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	943 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	944 format++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	945 } else if (format == '#') { / any buffer-like object */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	946 void p = (void )va_arg(p_va, char *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	947 FETCH_SIZE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	948
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	949 if (arg == Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	950 *p = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	951 STORE_SIZE(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	952 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	953 else if (PyString_Check(arg)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	954 *p = PyString_AS_STRING(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	955 STORE_SIZE(PyString_GET_SIZE(arg));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	956 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18887 diff changeset	957 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	958 else if (PyUnicode_Check(arg)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	959 uarg = UNICODE_DEFAULT_ENCODING(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	960 if (uarg == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	961 return converterr(CONV_UNICODE,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	962 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	963 *p = PyString_AS_STRING(uarg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	964 STORE_SIZE(PyString_GET_SIZE(uarg));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	965 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18887 diff changeset	966 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	967 else { /* any buffer-like object */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	968 char *buf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	969 Py_ssize_t count = convertbuffer(arg, p, &buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	970 if (count < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	971 return converterr(buf, arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	972 STORE_SIZE(count);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	973 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	974 format++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	975 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	976 char *p = va_arg(p_va, char **);
12051 d89556c04ef9 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11975 diff changeset	977
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	978 if (arg == Py_None)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	979 *p = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	980 else if (PyString_Check(arg))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	981 *p = PyString_AS_STRING(arg);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18887 diff changeset	982 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	983 else if (PyUnicode_Check(arg)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	984 uarg = UNICODE_DEFAULT_ENCODING(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	985 if (uarg == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	986 return converterr(CONV_UNICODE,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	987 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	988 *p = PyString_AS_STRING(uarg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	989 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18887 diff changeset	990 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	991 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	992 return converterr("string or None",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	993 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	994 if (*format == '#') {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	995 FETCH_SIZE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	996 assert(0); /* XXX redundant with if-case */
69798 509f1c15a1e1 Issue #8651: Fix "z#" format of PyArg_Parse() function: the size was not Victor Stinner <victor.stinner@haypocalc.com>* parents: 68256 diff changeset	997 if (arg == Py_None) {
509f1c15a1e1 Issue #8651: Fix "z#" format of PyArg_Parse() function: the size was not Victor Stinner <victor.stinner@haypocalc.com>* parents: 68256 diff changeset	998 STORE_SIZE(0);
509f1c15a1e1 Issue #8651: Fix "z#" format of PyArg_Parse() function: the size was not Victor Stinner <victor.stinner@haypocalc.com>* parents: 68256 diff changeset	999 } else {
509f1c15a1e1 Issue #8651: Fix "z#" format of PyArg_Parse() function: the size was not Victor Stinner <victor.stinner@haypocalc.com>* parents: 68256 diff changeset	1000 STORE_SIZE(PyString_Size(arg));
509f1c15a1e1 Issue #8651: Fix "z#" format of PyArg_Parse() function: the size was not Victor Stinner <victor.stinner@haypocalc.com>* parents: 68256 diff changeset	1001 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1002 format++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1003 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1004 else if (*p != NULL &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1005 (Py_ssize_t)strlen(*p) != PyString_Size(arg))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1006 return converterr(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1007 "string without null bytes or None",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1008 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1009 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1010 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1011 }
12051 d89556c04ef9 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11975 diff changeset	1012
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1013 case 'e': {/* encoded string */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1014 char **buffer;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1015 const char *encoding;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1016 PyObject *s;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1017 Py_ssize_t size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1018 int recode_strings;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1019
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1020 /* Get 'e' parameter: the encoding name */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1021 encoding = (const char )va_arg(p_va, const char *);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18887 diff changeset	1022 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1023 if (encoding == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1024 encoding = PyUnicode_GetDefaultEncoding();
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18887 diff changeset	1025 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1026
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1027 /* Get output buffer parameter:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1028 's' (recode all objects via Unicode) or
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1029 't' (only recode non-string objects)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1030 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1031 if (*format == 's')
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1032 recode_strings = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1033 else if (*format == 't')
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1034 recode_strings = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1035 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1036 return converterr(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1037 "(unknown parser marker combination)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1038 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1039 buffer = (char *)va_arg(p_va, char **);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1040 format++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1041 if (buffer == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1042 return converterr("(buffer is NULL)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1043 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1044
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1045 /* Encode object */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1046 if (!recode_strings && PyString_Check(arg)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1047 s = arg;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1048 Py_INCREF(s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1049 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1050 else {
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18887 diff changeset	1051 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1052 PyObject *u;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1053
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1054 /* Convert object to Unicode */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1055 u = PyUnicode_FromObject(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1056 if (u == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1057 return converterr(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1058 "string or unicode or text buffer",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1059 arg, msgbuf, bufsize);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18887 diff changeset	1060
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1061 /* Encode object; use default error handling */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1062 s = PyUnicode_AsEncodedString(u,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1063 encoding,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1064 NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1065 Py_DECREF(u);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1066 if (s == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1067 return converterr("(encoding failed)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1068 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1069 if (!PyString_Check(s)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1070 Py_DECREF(s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1071 return converterr(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1072 "(encoder failed to return a string)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1073 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1074 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18887 diff changeset	1075 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1076 return converterr("string<e>", arg, msgbuf, bufsize);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18887 diff changeset	1077 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1078 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1079 size = PyString_GET_SIZE(s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1080
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1081 /* Write output; output is guaranteed to be 0-terminated */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1082 if (*format == '#') {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1083 /* Using buffer length parameter '#':
12051 d89556c04ef9 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11975 diff changeset	1084
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1085 - if *buffer is NULL, a new buffer of the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1086 needed size is allocated and the data
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1087 copied into it; *buffer is updated to point
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1088 to the new buffer; the caller is
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1089 responsible for PyMem_Free()ing it after
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1090 usage
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1091
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1092 - if *buffer is not NULL, the data is
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1093 copied to buffer; buffer_len has to be
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1094 set to the size of the buffer on input;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1095 buffer overflow is signalled with an error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1096 buffer has to provide enough room for the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1097 encoded string plus the trailing 0-byte
12051 d89556c04ef9 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11975 diff changeset	1098
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1099 - in both cases, *buffer_len is updated to
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1100 the size of the buffer /excluding/ the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1101 trailing 0-byte
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1102
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1103 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1104 FETCH_SIZE;
12051 d89556c04ef9 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11975 diff changeset	1105
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1106 format++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1107 if (q == NULL && q2 == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1108 Py_DECREF(s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1109 return converterr(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1110 "(buffer_len is NULL)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1111 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1112 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1113 if (*buffer == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1114 *buffer = PyMem_NEW(char, size + 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1115 if (*buffer == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1116 Py_DECREF(s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1117 return converterr(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1118 "(memory error)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1119 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1120 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1121 if (addcleanup(*buffer, freelist, cleanup_ptr)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1122 Py_DECREF(s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1123 return converterr(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1124 "(cleanup problem)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1125 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1126 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1127 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1128 if (size + 1 > BUFFER_LEN) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1129 Py_DECREF(s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1130 return converterr(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1131 "(buffer overflow)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1132 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1133 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1134 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1135 memcpy(*buffer,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1136 PyString_AS_STRING(s),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1137 size + 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1138 STORE_SIZE(size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1139 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1140 /* Using a 0-terminated buffer:
17996 5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	1141
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1142 - the encoded string has to be 0-terminated
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1143 for this variant to work; if it is not, an
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1144 error raised
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1145
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1146 - a new buffer of the needed size is
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1147 allocated and the data copied into it;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1148 *buffer is updated to point to the new
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1149 buffer; the caller is responsible for
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1150 PyMem_Free()ing it after usage
17996 5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	1151
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1152 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1153 if ((Py_ssize_t)strlen(PyString_AS_STRING(s))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1154 != size) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1155 Py_DECREF(s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1156 return converterr(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1157 "encoded string without NULL bytes",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1158 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1159 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1160 *buffer = PyMem_NEW(char, size + 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1161 if (*buffer == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1162 Py_DECREF(s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1163 return converterr("(memory error)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1164 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1165 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1166 if (addcleanup(*buffer, freelist, cleanup_ptr)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1167 Py_DECREF(s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1168 return converterr("(cleanup problem)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1169 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1170 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1171 memcpy(*buffer,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1172 PyString_AS_STRING(s),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1173 size + 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1174 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1175 Py_DECREF(s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1176 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1177 }
12570 3dbe41380266 Brian Hooper <brian_takashi@hotmail.com>: Fred Drake <fdrake@acm.org> parents: 12510 diff changeset	1178
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18887 diff changeset	1179 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1180 case 'u': {/* raw unicode buffer (Py_UNICODE ) /
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1181 if (format == '#') { / any buffer-like object */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1182 void p = (void )va_arg(p_va, char *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1183 FETCH_SIZE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1184 if (PyUnicode_Check(arg)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1185 *p = PyUnicode_AS_UNICODE(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1186 STORE_SIZE(PyUnicode_GET_SIZE(arg));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1187 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1188 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1189 return converterr("cannot convert raw buffers",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1190 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1191 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1192 format++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1193 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1194 Py_UNICODE *p = va_arg(p_va, Py_UNICODE **);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1195 if (PyUnicode_Check(arg))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1196 *p = PyUnicode_AS_UNICODE(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1197 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1198 return converterr("unicode", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1199 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1200 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1201 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1202 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1203
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1204 case 'S': { /* string object */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1205 PyObject *p = va_arg(p_va, PyObject **);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1206 if (PyString_Check(arg))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1207 *p = arg;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1208 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1209 return converterr("string", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1210 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1211 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1212
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1213 #ifdef Py_USING_UNICODE
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1214 case 'U': { /* Unicode object */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1215 PyObject *p = va_arg(p_va, PyObject **);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1216 if (PyUnicode_Check(arg))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1217 *p = arg;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1218 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1219 return converterr("unicode", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1220 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1221 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18887 diff changeset	1222 #endif
12570 3dbe41380266 Brian Hooper <brian_takashi@hotmail.com>: Fred Drake <fdrake@acm.org> parents: 12510 diff changeset	1223
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1224 case 'O': { /* object */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1225 PyTypeObject *type;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1226 PyObject **p;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1227 if (*format == '!') {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1228 type = va_arg(p_va, PyTypeObject);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1229 p = va_arg(p_va, PyObject *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1230 format++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1231 if (PyType_IsSubtype(arg->ob_type, type))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1232 *p = arg;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1233 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1234 return converterr(type->tp_name, arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1235
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1236 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1237 else if (*format == '?') {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1238 inquiry pred = va_arg(*p_va, inquiry);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1239 p = va_arg(p_va, PyObject *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1240 format++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1241 if ((*pred)(arg))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1242 *p = arg;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1243 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1244 return converterr("(unspecified)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1245 arg, msgbuf, bufsize);
8358 da4bdceeaad7 Another veeeeeery old patch... Guido van Rossum <guido@python.org> parents: 7982 diff changeset	1246
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1247 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1248 else if (*format == '&') {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1249 typedef int (converter)(PyObject , void *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1250 converter convert = va_arg(*p_va, converter);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1251 void addr = va_arg(p_va, void *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1252 format++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1253 if (! (*convert)(arg, addr))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1254 return converterr("(unspecified)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1255 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1256 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1257 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1258 p = va_arg(p_va, PyObject *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1259 *p = arg;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1260 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1261 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1262 }
48221 b8c4bf393794 Issue #3139: Make buffer-interface thread-safe wrt. PyArg_ParseTuple, Martin v. Löwis <martin@v.loewis.de> parents: 47527 diff changeset	1263
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1264
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1265 case 'w': { /* memory buffer, read-write access */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1266 void *p = va_arg(p_va, void **);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1267 void *res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1268 PyBufferProcs *pb = arg->ob_type->tp_as_buffer;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1269 Py_ssize_t count;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1270
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1271 if (pb && pb->bf_releasebuffer && format != '')
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1272 /* Buffer must be released, yet caller does not use
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1273 the Py_buffer protocol. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1274 return converterr("pinned buffer", arg, msgbuf, bufsize);
8358 da4bdceeaad7 Another veeeeeery old patch... Guido van Rossum <guido@python.org> parents: 7982 diff changeset	1275
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1276 if (pb && pb->bf_getbuffer && format == '') {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1277 /* Caller is interested in Py_buffer, and the object
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1278 supports it directly. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1279 format++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1280 if (pb->bf_getbuffer(arg, (Py_buffer*)p, PyBUF_WRITABLE) < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1281 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1282 return converterr("read-write buffer", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1283 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1284 if (addcleanup(p, freelist, cleanup_buffer)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1285 return converterr(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1286 "(cleanup problem)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1287 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1288 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1289 if (!PyBuffer_IsContiguous((Py_buffer*)p, 'C'))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1290 return converterr("contiguous buffer", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1291 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1292 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1293
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1294 if (pb == NULL \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1295 pb->bf_getwritebuffer == NULL \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1296 pb->bf_getsegcount == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1297 return converterr("read-write buffer", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1298 if ((*pb->bf_getsegcount)(arg, NULL) != 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1299 return converterr("single-segment read-write buffer",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1300 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1301 if ((count = pb->bf_getwritebuffer(arg, 0, &res)) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1302 return converterr("(unspecified)", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1303 if (format == '') {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1304 PyBuffer_FillInfo((Py_buffer*)p, arg, res, count, 1, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1305 format++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1306 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1307 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1308 *p = res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1309 if (*format == '#') {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1310 FETCH_SIZE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1311 STORE_SIZE(count);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1312 format++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1313 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1314 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1315 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1316 }
9306 79439e4e9976 Implement new format character 't#'. This is like s#, accepting an Guido van Rossum <guido@python.org> parents: 9044 diff changeset	1317
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1318 case 't': { /* 8-bit character buffer, read-only access */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1319 char *p = va_arg(p_va, char **);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1320 PyBufferProcs *pb = arg->ob_type->tp_as_buffer;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1321 Py_ssize_t count;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1322
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1323 if (*format++ != '#')
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1324 return converterr(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1325 "invalid use of 't' format character",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1326 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1327 if (!PyType_HasFeature(arg->ob_type,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1328 Py_TPFLAGS_HAVE_GETCHARBUFFER) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1329 pb == NULL \|\| pb->bf_getcharbuffer == NULL \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1330 pb->bf_getsegcount == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1331 return converterr(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1332 "string or read-only character buffer",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1333 arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1334
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1335 if (pb->bf_getsegcount(arg, NULL) != 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1336 return converterr(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1337 "string or single-segment read-only buffer",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1338 arg, msgbuf, bufsize);
20371 8ef3e95182c3 Undo part of 2.59: 't' case of convertsimple() should not use convertbuffer(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 20357 diff changeset	1339
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1340 if (pb->bf_releasebuffer)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1341 return converterr(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1342 "string or pinned buffer",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1343 arg, msgbuf, bufsize);
9306 79439e4e9976 Implement new format character 't#'. This is like s#, accepting an Guido van Rossum <guido@python.org> parents: 9044 diff changeset	1344
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1345 count = pb->bf_getcharbuffer(arg, 0, p);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1346 if (count < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1347 return converterr("(unspecified)", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1348 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1349 FETCH_SIZE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1350 STORE_SIZE(count);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1351 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1352 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1353 }
9306 79439e4e9976 Implement new format character 't#'. This is like s#, accepting an Guido van Rossum <guido@python.org> parents: 9044 diff changeset	1354
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1355 default:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1356 return converterr("impossible<bad format char>", arg, msgbuf, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1357
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1358 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1359
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1360 *p_format = format;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1361 return NULL;
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	1362 }
4026 6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1363
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1364 static Py_ssize_t
20629 acc7e3b4d042 Style conformance: function name begins a new line consistently. Fred Drake <fdrake@acm.org> parents: 20371 diff changeset	1365 convertbuffer(PyObject arg, void p, char *errmsg)
17996 5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	1366 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1367 PyBufferProcs *pb = arg->ob_type->tp_as_buffer;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1368 Py_ssize_t count;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1369 if (pb == NULL \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1370 pb->bf_getreadbuffer == NULL \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1371 pb->bf_getsegcount == NULL \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1372 pb->bf_releasebuffer != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1373 *errmsg = "string or read-only buffer";
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1374 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1375 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1376 if ((*pb->bf_getsegcount)(arg, NULL) != 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1377 *errmsg = "string or single-segment read-only buffer";
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1378 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1379 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1380 if ((count = (*pb->bf_getreadbuffer)(arg, 0, p)) < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1381 *errmsg = "(unspecified)";
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1382 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1383 return count;
17996 5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	1384 }
4026 6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1385
48221 b8c4bf393794 Issue #3139: Make buffer-interface thread-safe wrt. PyArg_ParseTuple, Martin v. Löwis <martin@v.loewis.de> parents: 47527 diff changeset	1386 static int
48847 b1682c693b9a Fix: Neal Norwitz <nnorwitz@gmail.com> parents: 48221 diff changeset	1387 getbuffer(PyObject arg, Py_buffer view, char **errmsg)
48221 b8c4bf393794 Issue #3139: Make buffer-interface thread-safe wrt. PyArg_ParseTuple, Martin v. Löwis <martin@v.loewis.de> parents: 47527 diff changeset	1388 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1389 void *buf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1390 Py_ssize_t count;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1391 PyBufferProcs *pb = arg->ob_type->tp_as_buffer;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1392 if (pb == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1393 *errmsg = "string or buffer";
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1394 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1395 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1396 if (pb->bf_getbuffer) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1397 if (pb->bf_getbuffer(arg, view, 0) < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1398 *errmsg = "convertible to a buffer";
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1399 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1400 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1401 if (!PyBuffer_IsContiguous(view, 'C')) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1402 *errmsg = "contiguous buffer";
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1403 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1404 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1405 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1406 }
48221 b8c4bf393794 Issue #3139: Make buffer-interface thread-safe wrt. PyArg_ParseTuple, Martin v. Löwis <martin@v.loewis.de> parents: 47527 diff changeset	1407
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1408 count = convertbuffer(arg, &buf, errmsg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1409 if (count < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1410 *errmsg = "convertible to a buffer";
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1411 return count;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1412 }
75885 17c671529f7e Issue #10538. Put a reference to the source object in the Py_buffer when Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 69799 diff changeset	1413 PyBuffer_FillInfo(view, arg, buf, count, 1, 0);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1414 return 0;
17996 5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	1415 }
4026 6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1416
6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1417 /* Support for keyword arguments donated by
6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1418 Geoff Philbrick <philbric@delphi.hks.com> */
6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1419
20711 2890769b1e69 PyArg_ParseTupleAndKeywords: return false on internal error, not -1 (I Tim Peters <tim.peters@gmail.com> parents: 20710 diff changeset	1420 /* Return false (0) for error, else true. */
20629 acc7e3b4d042 Style conformance: function name begins a new line consistently. Fred Drake <fdrake@acm.org> parents: 20371 diff changeset	1421 int
acc7e3b4d042 Style conformance: function name begins a new line consistently. Fred Drake <fdrake@acm.org> parents: 20371 diff changeset	1422 PyArg_ParseTupleAndKeywords(PyObject *args,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1423 PyObject *keywords,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1424 const char *format,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1425 char **kwlist, ...)
4026 6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1426 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1427 int retval;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1428 va_list va;
20710 a44cc0c21cfe PyArg_ParseTupleAndKeywords: do basic sanity checks on the arguments, Tim Peters <tim.peters@gmail.com> parents: 20709 diff changeset	1429
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1430 if ((args == NULL \|\| !PyTuple_Check(args)) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1431 (keywords != NULL && !PyDict_Check(keywords)) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1432 format == NULL \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1433 kwlist == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1434 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1435 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1436 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1437 }
20710 a44cc0c21cfe PyArg_ParseTupleAndKeywords: do basic sanity checks on the arguments, Tim Peters <tim.peters@gmail.com> parents: 20709 diff changeset	1438
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1439 va_start(va, kwlist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1440 retval = vgetargskeywords(args, keywords, format, kwlist, &va, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1441 va_end(va);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1442 return retval;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1443 }
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1444
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1445 int
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1446 _PyArg_ParseTupleAndKeywords_SizeT(PyObject *args,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1447 PyObject *keywords,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1448 const char *format,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1449 char **kwlist, ...)
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1450 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1451 int retval;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1452 va_list va;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1453
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1454 if ((args == NULL \|\| !PyTuple_Check(args)) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1455 (keywords != NULL && !PyDict_Check(keywords)) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1456 format == NULL \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1457 kwlist == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1458 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1459 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1460 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1461 }
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1462
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1463 va_start(va, kwlist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1464 retval = vgetargskeywords(args, keywords, format,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1465 kwlist, &va, FLAG_SIZE_T);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1466 va_end(va);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1467 return retval;
4026 6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1468 }
6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1469
6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1470
32606 cc1f74d19fcb Add PyArg_VaParseTupleAndKeywords(). Document this function and Brett Cannon <bcannon@gmail.com> parents: 28952 diff changeset	1471 int
cc1f74d19fcb Add PyArg_VaParseTupleAndKeywords(). Document this function and Brett Cannon <bcannon@gmail.com> parents: 28952 diff changeset	1472 PyArg_VaParseTupleAndKeywords(PyObject *args,
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35552 diff changeset	1473 PyObject *keywords,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1474 const char *format,
36675 dba6494735d0 Revert backwards-incompatible const changes. Martin v. Löwis <martin@v.loewis.de> parents: 36625 diff changeset	1475 char **kwlist, va_list va)
32606 cc1f74d19fcb Add PyArg_VaParseTupleAndKeywords(). Document this function and Brett Cannon <bcannon@gmail.com> parents: 28952 diff changeset	1476 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1477 int retval;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1478 va_list lva;
32606 cc1f74d19fcb Add PyArg_VaParseTupleAndKeywords(). Document this function and Brett Cannon <bcannon@gmail.com> parents: 28952 diff changeset	1479
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1480 if ((args == NULL \|\| !PyTuple_Check(args)) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1481 (keywords != NULL && !PyDict_Check(keywords)) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1482 format == NULL \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1483 kwlist == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1484 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1485 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1486 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1487 }
32606 cc1f74d19fcb Add PyArg_VaParseTupleAndKeywords(). Document this function and Brett Cannon <bcannon@gmail.com> parents: 28952 diff changeset	1488
cc1f74d19fcb Add PyArg_VaParseTupleAndKeywords(). Document this function and Brett Cannon <bcannon@gmail.com> parents: 28952 diff changeset	1489 #ifdef VA_LIST_IS_ARRAY
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1490 memcpy(lva, va, sizeof(va_list));
32606 cc1f74d19fcb Add PyArg_VaParseTupleAndKeywords(). Document this function and Brett Cannon <bcannon@gmail.com> parents: 28952 diff changeset	1491 #else
cc1f74d19fcb Add PyArg_VaParseTupleAndKeywords(). Document this function and Brett Cannon <bcannon@gmail.com> parents: 28952 diff changeset	1492 #ifdef __va_copy
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1493 __va_copy(lva, va);
32606 cc1f74d19fcb Add PyArg_VaParseTupleAndKeywords(). Document this function and Brett Cannon <bcannon@gmail.com> parents: 28952 diff changeset	1494 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1495 lva = va;
32606 cc1f74d19fcb Add PyArg_VaParseTupleAndKeywords(). Document this function and Brett Cannon <bcannon@gmail.com> parents: 28952 diff changeset	1496 #endif
cc1f74d19fcb Add PyArg_VaParseTupleAndKeywords(). Document this function and Brett Cannon <bcannon@gmail.com> parents: 28952 diff changeset	1497 #endif
cc1f74d19fcb Add PyArg_VaParseTupleAndKeywords(). Document this function and Brett Cannon <bcannon@gmail.com> parents: 28952 diff changeset	1498
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1499 retval = vgetargskeywords(args, keywords, format, kwlist, &lva, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1500 return retval;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1501 }
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1502
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1503 int
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1504 _PyArg_VaParseTupleAndKeywords_SizeT(PyObject *args,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1505 PyObject *keywords,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1506 const char *format,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1507 char **kwlist, va_list va)
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1508 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1509 int retval;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1510 va_list lva;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1511
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1512 if ((args == NULL \|\| !PyTuple_Check(args)) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1513 (keywords != NULL && !PyDict_Check(keywords)) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1514 format == NULL \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1515 kwlist == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1516 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1517 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1518 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1519 }
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1520
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1521 #ifdef VA_LIST_IS_ARRAY
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1522 memcpy(lva, va, sizeof(va_list));
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1523 #else
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1524 #ifdef __va_copy
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1525 __va_copy(lva, va);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1526 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1527 lva = va;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1528 #endif
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1529 #endif
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1530
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1531 retval = vgetargskeywords(args, keywords, format,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1532 kwlist, &lva, FLAG_SIZE_T);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1533 return retval;
32606 cc1f74d19fcb Add PyArg_VaParseTupleAndKeywords(). Document this function and Brett Cannon <bcannon@gmail.com> parents: 28952 diff changeset	1534 }
cc1f74d19fcb Add PyArg_VaParseTupleAndKeywords(). Document this function and Brett Cannon <bcannon@gmail.com> parents: 28952 diff changeset	1535
45537 f33f66a2082f Patch #1691070 from Roger Upole: Speed up PyArg_ParseTupleAndKeywords() and improve error msg Christian Heimes <christian@cheimes.de> parents: 45530 diff changeset	1536 #define IS_END_OF_FORMAT(c) (c == '\0' \|\| c == ';' \|\| c == ':')
32606 cc1f74d19fcb Add PyArg_VaParseTupleAndKeywords(). Document this function and Brett Cannon <bcannon@gmail.com> parents: 28952 diff changeset	1537
4026 6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1538 static int
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35552 diff changeset	1539 vgetargskeywords(PyObject args, PyObject keywords, const char *format,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1540 char *kwlist, va_list p_va, int flags)
4026 6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1541 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1542 char msgbuf[512];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1543 int levels[32];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1544 const char fname, msg, custom_msg, keyword;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1545 int min = INT_MAX;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1546 int i, len, nargs, nkeywords;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1547 PyObject freelist = NULL, current_arg;
20708 e912b683ed3e vgetargskeywords(): remove test that can't succeed. Not a bugfix, just Tim Peters <tim.peters@gmail.com> parents: 20632 diff changeset	1548
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1549 assert(args != NULL && PyTuple_Check(args));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1550 assert(keywords == NULL \|\| PyDict_Check(keywords));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1551 assert(format != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1552 assert(kwlist != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1553 assert(p_va != NULL);
20710 a44cc0c21cfe PyArg_ParseTupleAndKeywords: do basic sanity checks on the arguments, Tim Peters <tim.peters@gmail.com> parents: 20709 diff changeset	1554
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1555 /* grab the function name or custom error msg first (mutually exclusive) */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1556 fname = strchr(format, ':');
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1557 if (fname) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1558 fname++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1559 custom_msg = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1560 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1561 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1562 custom_msg = strchr(format,';');
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1563 if (custom_msg)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1564 custom_msg++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1565 }
20711 2890769b1e69 PyArg_ParseTupleAndKeywords: return false on internal error, not -1 (I Tim Peters <tim.peters@gmail.com> parents: 20710 diff changeset	1566
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1567 /* scan kwlist and get greatest possible nbr of args */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1568 for (len=0; kwlist[len]; len++)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1569 continue;
20708 e912b683ed3e vgetargskeywords(): remove test that can't succeed. Not a bugfix, just Tim Peters <tim.peters@gmail.com> parents: 20632 diff changeset	1570
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1571 nargs = PyTuple_GET_SIZE(args);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1572 nkeywords = (keywords == NULL) ? 0 : PyDict_Size(keywords);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1573 if (nargs + nkeywords > len) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1574 PyErr_Format(PyExc_TypeError, "%s%s takes at most %d "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1575 "argument%s (%d given)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1576 (fname == NULL) ? "function" : fname,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1577 (fname == NULL) ? "" : "()",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1578 len,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1579 (len == 1) ? "" : "s",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1580 nargs + nkeywords);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1581 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1582 }
20716 dcf769c12d8b vgetargskeywords: Removed one of the mysterious PyErr_Clear() calls. Tim Peters <tim.peters@gmail.com> parents: 20715 diff changeset	1583
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1584 /* convert tuple args and keyword args in same loop, using kwlist to drive process */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1585 for (i = 0; i < len; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1586 keyword = kwlist[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1587 if (*format == '\|') {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1588 min = i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1589 format++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1590 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1591 if (IS_END_OF_FORMAT(*format)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1592 PyErr_Format(PyExc_RuntimeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1593 "More keyword list entries (%d) than "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1594 "format specifiers (%d)", len, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1595 return cleanreturn(0, freelist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1596 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1597 current_arg = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1598 if (nkeywords) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1599 current_arg = PyDict_GetItemString(keywords, keyword);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1600 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1601 if (current_arg) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1602 --nkeywords;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1603 if (i < nargs) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1604 /* arg present in tuple and in dict */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1605 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1606 "Argument given by name ('%s') "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1607 "and position (%d)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1608 keyword, i+1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1609 return cleanreturn(0, freelist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1610 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1611 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1612 else if (nkeywords && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1613 return cleanreturn(0, freelist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1614 else if (i < nargs)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1615 current_arg = PyTuple_GET_ITEM(args, i);
20718 c6384591d846 vgetargskeywords: Removed all PyErr_Clear() calls. It's possible that Tim Peters <tim.peters@gmail.com> parents: 20717 diff changeset	1616
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1617 if (current_arg) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1618 msg = convertitem(current_arg, &format, p_va, flags,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1619 levels, msgbuf, sizeof(msgbuf), &freelist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1620 if (msg) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1621 seterror(i+1, msg, levels, fname, custom_msg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1622 return cleanreturn(0, freelist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1623 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1624 continue;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1625 }
20715 5e6f8187bd48 vgetargskeywords: Tim Peters <tim.peters@gmail.com> parents: 20714 diff changeset	1626
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1627 if (i < min) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1628 PyErr_Format(PyExc_TypeError, "Required argument "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1629 "'%s' (pos %d) not found",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1630 keyword, i+1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1631 return cleanreturn(0, freelist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1632 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1633 /* current code reports success when all required args
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1634 * fulfilled and no keyword args left, with no further
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1635 * validation. XXX Maybe skip this in debug build ?
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1636 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1637 if (!nkeywords)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1638 return cleanreturn(1, freelist);
45537 f33f66a2082f Patch #1691070 from Roger Upole: Speed up PyArg_ParseTupleAndKeywords() and improve error msg Christian Heimes <christian@cheimes.de> parents: 45530 diff changeset	1639
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1640 /* We are into optional args, skip thru to any remaining
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1641 * keyword args */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1642 msg = skipitem(&format, p_va, flags);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1643 if (msg) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1644 PyErr_Format(PyExc_RuntimeError, "%s: '%s'", msg,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1645 format);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1646 return cleanreturn(0, freelist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1647 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1648 }
4026 6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1649
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1650 if (!IS_END_OF_FORMAT(format) && format != '\|') {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1651 PyErr_Format(PyExc_RuntimeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1652 "more argument specifiers than keyword list entries "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1653 "(remaining format:'%s')", format);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1654 return cleanreturn(0, freelist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1655 }
20715 5e6f8187bd48 vgetargskeywords: Tim Peters <tim.peters@gmail.com> parents: 20714 diff changeset	1656
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1657 /* make sure there are no extraneous keyword arguments */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1658 if (nkeywords > 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1659 PyObject key, value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1660 Py_ssize_t pos = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1661 while (PyDict_Next(keywords, &pos, &key, &value)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1662 int match = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1663 char *ks;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1664 if (!PyString_Check(key)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1665 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1666 "keywords must be strings");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1667 return cleanreturn(0, freelist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1668 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1669 ks = PyString_AsString(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1670 for (i = 0; i < len; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1671 if (!strcmp(ks, kwlist[i])) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1672 match = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1673 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1674 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1675 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1676 if (!match) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1677 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1678 "'%s' is an invalid keyword "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1679 "argument for this function",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1680 ks);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1681 return cleanreturn(0, freelist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1682 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1683 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1684 }
20723 6ac45244c41e vgetargskeywords() Tim Peters <tim.peters@gmail.com> parents: 20722 diff changeset	1685
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1686 return cleanreturn(1, freelist);
4026 6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1687 }
6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1688
6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1689
6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1690 static char *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1691 skipitem(const char *p_format, va_list p_va, int flags)
4026 6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1692 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1693 const char format = p_format;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1694 char c = *format++;
35552 9b7d117eb4bc Complete format code support in getargs.c::skipitem(), which is called when Georg Brandl <georg@python.org> parents: 35449 diff changeset	1695
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1696 switch (c) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1697
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1698 /* simple codes
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1699 * The individual types (second arg of va_arg) are irrelevant */
35552 9b7d117eb4bc Complete format code support in getargs.c::skipitem(), which is called when Georg Brandl <georg@python.org> parents: 35449 diff changeset	1700
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1701 case 'b': /* byte -- very short int */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1702 case 'B': /* byte as bitfield */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1703 case 'h': /* short int */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1704 case 'H': /* short int as bitfield */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1705 case 'i': /* int */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1706 case 'I': /* int sized bitfield */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1707 case 'l': /* long int */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1708 case 'k': /* long int sized bitfield */
35552 9b7d117eb4bc Complete format code support in getargs.c::skipitem(), which is called when Georg Brandl <georg@python.org> parents: 35449 diff changeset	1709 #ifdef HAVE_LONG_LONG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1710 case 'L': /* PY_LONG_LONG */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1711 case 'K': /* PY_LONG_LONG sized bitfield */
35552 9b7d117eb4bc Complete format code support in getargs.c::skipitem(), which is called when Georg Brandl <georg@python.org> parents: 35449 diff changeset	1712 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1713 case 'f': /* float */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1714 case 'd': /* double */
35552 9b7d117eb4bc Complete format code support in getargs.c::skipitem(), which is called when Georg Brandl <georg@python.org> parents: 35449 diff changeset	1715 #ifndef WITHOUT_COMPLEX
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1716 case 'D': /* complex double */
35552 9b7d117eb4bc Complete format code support in getargs.c::skipitem(), which is called when Georg Brandl <georg@python.org> parents: 35449 diff changeset	1717 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1718 case 'c': /* char */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1719 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1720 (void) va_arg(p_va, void );
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1721 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1722 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1723
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1724 case 'n': /* Py_ssize_t */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1725 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1726 (void) va_arg(p_va, Py_ssize_t );
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1727 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1728 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1729
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1730 /* string codes */
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1731
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1732 case 'e': /* string with encoding */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1733 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1734 (void) va_arg(p_va, const char );
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1735 if (!(format == 's' \|\| format == 't'))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1736 /* after 'e', only 's' and 't' is allowed */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1737 goto err;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1738 format++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1739 /* explicit fallthrough to string cases */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1740 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1741
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1742 case 's': /* string */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1743 case 'z': /* string or None */
35552 9b7d117eb4bc Complete format code support in getargs.c::skipitem(), which is called when Georg Brandl <georg@python.org> parents: 35449 diff changeset	1744 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1745 case 'u': /* unicode string */
35552 9b7d117eb4bc Complete format code support in getargs.c::skipitem(), which is called when Georg Brandl <georg@python.org> parents: 35449 diff changeset	1746 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1747 case 't': /* buffer, read-only */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1748 case 'w': /* buffer, read-write */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1749 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1750 (void) va_arg(p_va, char *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1751 if (*format == '#') {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1752 if (flags & FLAG_SIZE_T)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1753 (void) va_arg(p_va, Py_ssize_t );
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1754 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1755 (void) va_arg(p_va, int );
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1756 format++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1757 } else if ((c == 's' \|\| c == 'z') && format == '') {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1758 format++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1759 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1760 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1761 }
35552 9b7d117eb4bc Complete format code support in getargs.c::skipitem(), which is called when Georg Brandl <georg@python.org> parents: 35449 diff changeset	1762
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1763 /* object codes */
35552 9b7d117eb4bc Complete format code support in getargs.c::skipitem(), which is called when Georg Brandl <georg@python.org> parents: 35449 diff changeset	1764
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1765 case 'S': /* string object */
35552 9b7d117eb4bc Complete format code support in getargs.c::skipitem(), which is called when Georg Brandl <georg@python.org> parents: 35449 diff changeset	1766 #ifdef Py_USING_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1767 case 'U': /* unicode string object */
35552 9b7d117eb4bc Complete format code support in getargs.c::skipitem(), which is called when Georg Brandl <georg@python.org> parents: 35449 diff changeset	1768 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1769 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1770 (void) va_arg(p_va, PyObject *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1771 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1772 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1773
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1774 case 'O': /* object */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1775 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1776 if (*format == '!') {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1777 format++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1778 (void) va_arg(p_va, PyTypeObject);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1779 (void) va_arg(p_va, PyObject *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1780 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1781 else if (*format == '&') {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1782 typedef int (converter)(PyObject , void *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1783 (void) va_arg(*p_va, converter);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1784 (void) va_arg(p_va, void );
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1785 format++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1786 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1787 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1788 (void) va_arg(p_va, PyObject *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1789 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1790 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1791 }
45537 f33f66a2082f Patch #1691070 from Roger Upole: Speed up PyArg_ParseTupleAndKeywords() and improve error msg Christian Heimes <christian@cheimes.de> parents: 45530 diff changeset	1792
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1793 case '(': /* bypass tuple, not handled at all previously */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1794 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1795 char *msg;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1796 for (;;) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1797 if (*format==')')
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1798 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1799 if (IS_END_OF_FORMAT(*format))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1800 return "Unmatched left paren in format "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1801 "string";
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1802 msg = skipitem(&format, p_va, flags);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1803 if (msg)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1804 return msg;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1805 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1806 format++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1807 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1808 }
45537 f33f66a2082f Patch #1691070 from Roger Upole: Speed up PyArg_ParseTupleAndKeywords() and improve error msg Christian Heimes <christian@cheimes.de> parents: 45530 diff changeset	1809
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1810 case ')':
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1811 return "Unmatched right paren in format string";
45537 f33f66a2082f Patch #1691070 from Roger Upole: Speed up PyArg_ParseTupleAndKeywords() and improve error msg Christian Heimes <christian@cheimes.de> parents: 45530 diff changeset	1812
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1813 default:
35552 9b7d117eb4bc Complete format code support in getargs.c::skipitem(), which is called when Georg Brandl <georg@python.org> parents: 35449 diff changeset	1814 err:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1815 return "impossible<bad format char>";
35552 9b7d117eb4bc Complete format code support in getargs.c::skipitem(), which is called when Georg Brandl <georg@python.org> parents: 35449 diff changeset	1816
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1817 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1818
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1819 *p_format = format;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1820 return NULL;
4026 6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1821 }
20632 6c84d55abb58 PyArg_UnpackTuple(): New argument unpacking function suggested by Jim Fred Drake <fdrake@acm.org> parents: 20629 diff changeset	1822
6c84d55abb58 PyArg_UnpackTuple(): New argument unpacking function suggested by Jim Fred Drake <fdrake@acm.org> parents: 20629 diff changeset	1823
6c84d55abb58 PyArg_UnpackTuple(): New argument unpacking function suggested by Jim Fred Drake <fdrake@acm.org> parents: 20629 diff changeset	1824 int
36750 92ba72484ff3 Use Py_ssize_t for PyArg_UnpackTuple arguments. Martin v. Löwis <martin@v.loewis.de> parents: 36675 diff changeset	1825 PyArg_UnpackTuple(PyObject args, const char name, Py_ssize_t min, Py_ssize_t max, ...)
20632 6c84d55abb58 PyArg_UnpackTuple(): New argument unpacking function suggested by Jim Fred Drake <fdrake@acm.org> parents: 20629 diff changeset	1826 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1827 Py_ssize_t i, l;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1828 PyObject **o;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1829 va_list vargs;
20632 6c84d55abb58 PyArg_UnpackTuple(): New argument unpacking function suggested by Jim Fred Drake <fdrake@acm.org> parents: 20629 diff changeset	1830
6c84d55abb58 PyArg_UnpackTuple(): New argument unpacking function suggested by Jim Fred Drake <fdrake@acm.org> parents: 20629 diff changeset	1831 #ifdef HAVE_STDARG_PROTOTYPES
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1832 va_start(vargs, max);
20632 6c84d55abb58 PyArg_UnpackTuple(): New argument unpacking function suggested by Jim Fred Drake <fdrake@acm.org> parents: 20629 diff changeset	1833 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1834 va_start(vargs);
20632 6c84d55abb58 PyArg_UnpackTuple(): New argument unpacking function suggested by Jim Fred Drake <fdrake@acm.org> parents: 20629 diff changeset	1835 #endif
6c84d55abb58 PyArg_UnpackTuple(): New argument unpacking function suggested by Jim Fred Drake <fdrake@acm.org> parents: 20629 diff changeset	1836
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1837 assert(min >= 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1838 assert(min <= max);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1839 if (!PyTuple_Check(args)) {
78951 aa804ef5a6ca Added missing va_end in error branch of PyArg_UnpackTuple(). CID 486641 Christian Heimes <christian@cheimes.de> parents: 75885 diff changeset	1840 va_end(vargs);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1841 PyErr_SetString(PyExc_SystemError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1842 "PyArg_UnpackTuple() argument list is not a tuple");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1843 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1844 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1845 l = PyTuple_GET_SIZE(args);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1846 if (l < min) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1847 if (name != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1848 PyErr_Format(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1849 PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1850 "%s expected %s%zd arguments, got %zd",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1851 name, (min == max ? "" : "at least "), min, l);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1852 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1853 PyErr_Format(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1854 PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1855 "unpacked tuple should have %s%zd elements,"
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1856 " but has %zd",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1857 (min == max ? "" : "at least "), min, l);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1858 va_end(vargs);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1859 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1860 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1861 if (l > max) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1862 if (name != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1863 PyErr_Format(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1864 PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1865 "%s expected %s%zd arguments, got %zd",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1866 name, (min == max ? "" : "at most "), max, l);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1867 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1868 PyErr_Format(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1869 PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1870 "unpacked tuple should have %s%zd elements,"
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1871 " but has %zd",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1872 (min == max ? "" : "at most "), max, l);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1873 va_end(vargs);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1874 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1875 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1876 for (i = 0; i < l; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1877 o = va_arg(vargs, PyObject **);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1878 *o = PyTuple_GET_ITEM(args, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1879 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1880 va_end(vargs);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1881 return 1;
20632 6c84d55abb58 PyArg_UnpackTuple(): New argument unpacking function suggested by Jim Fred Drake <fdrake@acm.org> parents: 20629 diff changeset	1882 }
35449 1fdfd0130e28 Disallow keyword arguments for type constructors that don't use them. Georg Brandl <georg@python.org> parents: 34846 diff changeset	1883
1fdfd0130e28 Disallow keyword arguments for type constructors that don't use them. Georg Brandl <georg@python.org> parents: 34846 diff changeset	1884
1fdfd0130e28 Disallow keyword arguments for type constructors that don't use them. Georg Brandl <georg@python.org> parents: 34846 diff changeset	1885 /* For type constructors that don't take keyword args
1fdfd0130e28 Disallow keyword arguments for type constructors that don't use them. Georg Brandl <georg@python.org> parents: 34846 diff changeset	1886 *
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1887 * Sets a TypeError and returns 0 if the kwds dict is
39865 936297047c17 Fix typo. Walter Dörwald <walter@livinglogic.de> parents: 39408 diff changeset	1888 * not empty, returns 1 otherwise
35449 1fdfd0130e28 Disallow keyword arguments for type constructors that don't use them. Georg Brandl <georg@python.org> parents: 34846 diff changeset	1889 */
1fdfd0130e28 Disallow keyword arguments for type constructors that don't use them. Georg Brandl <georg@python.org> parents: 34846 diff changeset	1890 int
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35552 diff changeset	1891 _PyArg_NoKeywords(const char funcname, PyObject kw)
35449 1fdfd0130e28 Disallow keyword arguments for type constructors that don't use them. Georg Brandl <georg@python.org> parents: 34846 diff changeset	1892 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1893 if (kw == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1894 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1895 if (!PyDict_CheckExact(kw)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1896 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1897 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1898 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1899 if (PyDict_Size(kw) == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1900 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1901
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1902 PyErr_Format(PyExc_TypeError, "%s does not take keyword arguments",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1903 funcname);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52903 diff changeset	1904 return 0;
35449 1fdfd0130e28 Disallow keyword arguments for type constructors that don't use them. Georg Brandl <georg@python.org> parents: 34846 diff changeset	1905 }
37619 f19addd69ad9 avoid C++ name mangling for the _Py.SizeT functions Anthony Baxter <anthonybaxter@gmail.com>* parents: 36773 diff changeset	1906 #ifdef __cplusplus
f19addd69ad9 avoid C++ name mangling for the _Py.SizeT functions Anthony Baxter <anthonybaxter@gmail.com>* parents: 36773 diff changeset	1907 };
f19addd69ad9 avoid C++ name mangling for the _Py.SizeT functions Anthony Baxter <anthonybaxter@gmail.com>* parents: 36773 diff changeset	1908 #endif

Mercurial > cpython-lru_cache-weakref

annotate Python/getargs.c @ 87680:02d186e3af09 2.7