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

annotate Python/getargs.c @ 84172:e353f64dfd95

importlib.abc.SourceLoader.get_source() was re-raising SyntaxError and UnicodeDecodeError as ImportError. That was over-reaching the point of raising ImportError in get_source() (which is to signal the source code was not found when it should have). Conflating the two exceptions with ImportError could lead to masking errors with the source which should be known outside of whether there was an error simply getting the source to begin with.

author	Brett Cannon <brett@python.org>
date	Sun, 16 Jun 2013 18:05:54 -0400
parents	aeebbae8c74c
children	63bc2fe28a6e

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
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	9 #ifdef __cplusplus
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	10 extern "C" {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 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 ,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 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 ,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 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
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	21 #ifdef HAVE_DECLSPEC_DLL
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	22 /* Export functions */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	23 PyAPI_FUNC(int) _PyArg_Parse_SizeT(PyObject , char , ...);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	24 PyAPI_FUNC(int) _PyArg_ParseTuple_SizeT(PyObject , char , ...);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	25 PyAPI_FUNC(int) _PyArg_ParseTupleAndKeywords_SizeT(PyObject , PyObject ,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	26 const char , char *, ...);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	27 PyAPI_FUNC(PyObject ) _Py_BuildValue_SizeT(const char , ...);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	28 PyAPI_FUNC(int) _PyArg_VaParse_SizeT(PyObject , char , va_list);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	29 PyAPI_FUNC(int) _PyArg_VaParseTupleAndKeywords_SizeT(PyObject , PyObject ,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	30 const char , char *, va_list);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	31 #endif
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 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
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	36 typedef int (destr_t)(PyObject , void *);
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	37
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	38
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	39 /* Keep track of "objects" that have been allocated or initialized and
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	40 which will need to be deallocated or cleaned up somehow if overall
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	41 parsing fails.
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	42 */
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	43 typedef struct {
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	44 void *item;
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	45 destr_t destructor;
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	46 } freelistentry_t;
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	47
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	48 typedef struct {
82233 4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	49 freelistentry_t *entries;
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	50 int first_available;
82233 4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	51 int entries_malloced;
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	52 } freelist_t;
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	53
82233 4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	54 #define STATIC_FREELIST_ENTRIES 8
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	55
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	56 /* Forward */
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35552 diff changeset	57 static int vgetargs1(PyObject , const char , va_list *, int);
83802 ef5dd5bda323 Fix compilater warnings on Windows 64-bit Victor Stinner <victor.stinner@gmail.com> parents: 82233 diff changeset	58 static void seterror(Py_ssize_t, const char , int , const char , const char );
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	59 static char convertitem(PyObject , const char *, va_list , int, int *,
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	60 char , size_t, freelist_t );
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	61 static char converttuple(PyObject , const char *, va_list , int,
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	62 int , char , size_t, int, freelist_t *);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	63 static char convertsimple(PyObject , const char *, va_list , int, char *,
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	64 size_t, freelist_t *);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	65 static Py_ssize_t convertbuffer(PyObject , void p, char *);
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48660 diff changeset	66 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	67
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13378 diff changeset	68 static int vgetargskeywords(PyObject , PyObject ,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	69 const char , char , va_list , int);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	70 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	71
20629 acc7e3b4d042 Style conformance: function name begins a new line consistently. Fred Drake <fdrake@acm.org> parents: 20371 diff changeset	72 int
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35552 diff changeset	73 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	74 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	75 int retval;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	76 va_list va;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	77
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	78 va_start(va, format);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	79 retval = vgetargs1(args, format, &va, FLAG_COMPAT);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	80 va_end(va);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	81 return retval;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	82 }
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	83
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	84 int
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	85 _PyArg_Parse_SizeT(PyObject args, char format, ...)
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	86 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	87 int retval;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	88 va_list va;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	89
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	90 va_start(va, format);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	91 retval = vgetargs1(args, format, &va, FLAG_COMPAT\|FLAG_SIZE_T);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	92 va_end(va);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	93 return retval;
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	94 }
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	95
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	96
20629 acc7e3b4d042 Style conformance: function name begins a new line consistently. Fred Drake <fdrake@acm.org> parents: 20371 diff changeset	97 int
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35552 diff changeset	98 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	99 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	100 int retval;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	101 va_list va;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	102
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	103 va_start(va, format);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	104 retval = vgetargs1(args, format, &va, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	105 va_end(va);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	106 return retval;
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	107 }
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	108
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	109 int
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	110 _PyArg_ParseTuple_SizeT(PyObject args, char format, ...)
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	111 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	112 int retval;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	113 va_list va;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	114
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	115 va_start(va, format);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	116 retval = vgetargs1(args, format, &va, FLAG_SIZE_T);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	117 va_end(va);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	118 return retval;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	119 }
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	120
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	121
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	122 int
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35552 diff changeset	123 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	124 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	125 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	126
63924 9108e7dcd7d8 Issue #2443: Added a new macro, Py_VA_COPY, which is equivalent to C99 Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 63259 diff changeset	127 Py_VA_COPY(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	128
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	129 return vgetargs1(args, format, &lva, 0);
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	130 }
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	131
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	132 int
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	133 _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	134 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	135 va_list lva;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	136
63924 9108e7dcd7d8 Issue #2443: Added a new macro, Py_VA_COPY, which is equivalent to C99 Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 63259 diff changeset	137 Py_VA_COPY(lva, va);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	138
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	139 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	140 }
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	141
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	142
28952 6c4a04ce965c Patch #684981: Add cleanup capability for argument parsers. Fixes 501716. Martin v. Löwis <martin@v.loewis.de> parents: 28667 diff changeset	143 /* 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	144
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	145 static int
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	146 cleanup_ptr(PyObject self, void ptr)
48888 27e142d99a71 #3668: When PyArg_ParseTuple correctly parses a s* format, but raises an Antoine Pitrou <solipsis@pitrou.net> parents: 48880 diff changeset	147 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	148 if (ptr) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	149 PyMem_FREE(ptr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	150 }
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	151 return 0;
48888 27e142d99a71 #3668: When PyArg_ParseTuple correctly parses a s* format, but raises an Antoine Pitrou <solipsis@pitrou.net> parents: 48880 diff changeset	152 }
27e142d99a71 #3668: When PyArg_ParseTuple correctly parses a s* format, but raises an Antoine Pitrou <solipsis@pitrou.net> parents: 48880 diff changeset	153
28952 6c4a04ce965c Patch #684981: Add cleanup capability for argument parsers. Fixes 501716. Martin v. Löwis <martin@v.loewis.de> parents: 28667 diff changeset	154 static int
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	155 cleanup_buffer(PyObject self, void ptr)
28952 6c4a04ce965c Patch #684981: Add cleanup capability for argument parsers. Fixes 501716. Martin v. Löwis <martin@v.loewis.de> parents: 28667 diff changeset	156 {
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	157 Py_buffer buf = (Py_buffer )ptr;
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	158 if (buf) {
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	159 PyBuffer_Release(buf);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	160 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	161 return 0;
54421 11de35da281c Issue #6012: Add cleanup support to O& argument parsing. Martin v. Löwis <martin@v.loewis.de> parents: 53816 diff changeset	162 }
11de35da281c Issue #6012: Add cleanup support to O& argument parsing. Martin v. Löwis <martin@v.loewis.de> parents: 53816 diff changeset	163
28952 6c4a04ce965c Patch #684981: Add cleanup capability for argument parsers. Fixes 501716. Martin v. Löwis <martin@v.loewis.de> parents: 28667 diff changeset	164 static int
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	165 addcleanup(void ptr, freelist_t freelist, destr_t destructor)
28952 6c4a04ce965c Patch #684981: Add cleanup capability for argument parsers. Fixes 501716. Martin v. Löwis <martin@v.loewis.de> parents: 28667 diff changeset	166 {
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	167 int index;
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	168
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	169 index = freelist->first_available;
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	170 freelist->first_available += 1;
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	171
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	172 freelist->entries[index].item = ptr;
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	173 freelist->entries[index].destructor = destructor;
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	174
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	175 return 0;
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	176 }
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	177
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	178 static int
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	179 cleanreturn(int retval, freelist_t *freelist)
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	180 {
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	181 int index;
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	182
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	183 if (retval == 0) {
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	184 /* A failure occurred, therefore execute all of the cleanup
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	185 functions.
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	186 */
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	187 for (index = 0; index < freelist->first_available; ++index) {
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	188 freelist->entries[index].destructor(NULL,
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	189 freelist->entries[index].item);
9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	190 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	191 }
82233 4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	192 if (freelist->entries_malloced)
4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	193 PyMem_FREE(freelist->entries);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	194 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	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
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	198 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	199 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	200 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	201 char msgbuf[256];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	202 int levels[32];
82233 4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	203 freelistentry_t static_entries[STATIC_FREELIST_ENTRIES];
4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	204 freelist_t freelist = {static_entries, 0, 0};
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	205 const char *fname = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	206 const char *message = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	207 int min = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	208 int max = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	209 int level = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	210 int endfmt = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	211 const char *formatsave = format;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	212 Py_ssize_t i, len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	213 char *msg;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	214 int compat = flags & FLAG_COMPAT;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	215
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	216 assert(compat \|\| (args != (PyObject*)NULL));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	217 flags = flags & ~FLAG_COMPAT;
16582 9a8e961b505f Related to SF bug 132008 (PyList_Reverse blows up). Tim Peters <tim.peters@gmail.com> parents: 16264 diff changeset	218
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	219 while (endfmt == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	220 int c = *format++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	221 switch (c) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	222 case '(':
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	223 if (level == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	224 max++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	225 level++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	226 if (level >= 30)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	227 Py_FatalError("too many tuple nesting levels "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	228 "in argument format string");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	229 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	230 case ')':
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	231 if (level == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	232 Py_FatalError("excess ')' in getargs format");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	233 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	234 level--;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	235 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	236 case '\0':
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	237 endfmt = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	238 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	239 case ':':
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	240 fname = format;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	241 endfmt = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	242 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	243 case ';':
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	244 message = format;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	245 endfmt = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	246 break;
82233 4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	247 case '\|':
4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	248 if (level == 0)
4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	249 min = max;
4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	250 break;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	251 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	252 if (level == 0) {
82233 4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	253 if (Py_ISALPHA(Py_CHARMASK(c)))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	254 if (c != 'e') /* skip encoded */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	255 max++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	256 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	257 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	258 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	259 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	260
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	261 if (level != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	262 Py_FatalError(/* '(' */ "missing ')' in getargs format");
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	263
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	264 if (min < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	265 min = max;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	266
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	267 format = formatsave;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	268
82233 4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	269 if (max > STATIC_FREELIST_ENTRIES) {
4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	270 freelist.entries = PyMem_NEW(freelistentry_t, max);
4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	271 if (freelist.entries == NULL) {
4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	272 PyErr_NoMemory();
4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	273 return 0;
4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	274 }
4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	275 freelist.entries_malloced = 1;
75746 2b8994c2851a check result of PyMem_New Benjamin Peterson <benjamin@python.org> parents: 75733 diff changeset	276 }
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	277
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	278 if (compat) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	279 if (max == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	280 if (args == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	281 return 1;
68809 4c2135930882 Issue #10833: Use PyErr_Format() and PyUnicode_FromFormat() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68796 diff changeset	282 PyErr_Format(PyExc_TypeError,
4c2135930882 Issue #10833: Use PyErr_Format() and PyUnicode_FromFormat() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68796 diff changeset	283 "%.200s%s takes no arguments",
4c2135930882 Issue #10833: Use PyErr_Format() and PyUnicode_FromFormat() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68796 diff changeset	284 fname==NULL ? "function" : fname,
4c2135930882 Issue #10833: Use PyErr_Format() and PyUnicode_FromFormat() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68796 diff changeset	285 fname==NULL ? "" : "()");
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	286 return cleanreturn(0, &freelist);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	287 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	288 else if (min == 1 && max == 1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	289 if (args == NULL) {
68809 4c2135930882 Issue #10833: Use PyErr_Format() and PyUnicode_FromFormat() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68796 diff changeset	290 PyErr_Format(PyExc_TypeError,
4c2135930882 Issue #10833: Use PyErr_Format() and PyUnicode_FromFormat() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68796 diff changeset	291 "%.200s%s takes at least one argument",
4c2135930882 Issue #10833: Use PyErr_Format() and PyUnicode_FromFormat() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68796 diff changeset	292 fname==NULL ? "function" : fname,
4c2135930882 Issue #10833: Use PyErr_Format() and PyUnicode_FromFormat() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68796 diff changeset	293 fname==NULL ? "" : "()");
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	294 return cleanreturn(0, &freelist);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	295 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	296 msg = convertitem(args, &format, p_va, flags, levels,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	297 msgbuf, sizeof(msgbuf), &freelist);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	298 if (msg == NULL)
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	299 return cleanreturn(1, &freelist);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	300 seterror(levels[0], msg, levels+1, fname, message);
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	301 return cleanreturn(0, &freelist);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	302 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	303 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	304 PyErr_SetString(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	305 "old style getargs format uses new features");
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	306 return cleanreturn(0, &freelist);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	307 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	308 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	309
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	310 if (!PyTuple_Check(args)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	311 PyErr_SetString(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	312 "new style getargs format but argument is not a tuple");
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	313 return cleanreturn(0, &freelist);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	314 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	315
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	316 len = PyTuple_GET_SIZE(args);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	317
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	318 if (len < min \|\| max < len) {
68809 4c2135930882 Issue #10833: Use PyErr_Format() and PyUnicode_FromFormat() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68796 diff changeset	319 if (message == NULL)
4c2135930882 Issue #10833: Use PyErr_Format() and PyUnicode_FromFormat() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68796 diff changeset	320 PyErr_Format(PyExc_TypeError,
4c2135930882 Issue #10833: Use PyErr_Format() and PyUnicode_FromFormat() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68796 diff changeset	321 "%.150s%s takes %s %d argument%s (%ld given)",
4c2135930882 Issue #10833: Use PyErr_Format() and PyUnicode_FromFormat() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68796 diff changeset	322 fname==NULL ? "function" : fname,
4c2135930882 Issue #10833: Use PyErr_Format() and PyUnicode_FromFormat() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68796 diff changeset	323 fname==NULL ? "" : "()",
4c2135930882 Issue #10833: Use PyErr_Format() and PyUnicode_FromFormat() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68796 diff changeset	324 min==max ? "exactly"
4c2135930882 Issue #10833: Use PyErr_Format() and PyUnicode_FromFormat() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68796 diff changeset	325 : len < min ? "at least" : "at most",
4c2135930882 Issue #10833: Use PyErr_Format() and PyUnicode_FromFormat() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68796 diff changeset	326 len < min ? min : max,
4c2135930882 Issue #10833: Use PyErr_Format() and PyUnicode_FromFormat() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68796 diff changeset	327 (len < min ? min : max) == 1 ? "" : "s",
4c2135930882 Issue #10833: Use PyErr_Format() and PyUnicode_FromFormat() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68796 diff changeset	328 Py_SAFE_DOWNCAST(len, Py_ssize_t, long));
4c2135930882 Issue #10833: Use PyErr_Format() and PyUnicode_FromFormat() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68796 diff changeset	329 else
4c2135930882 Issue #10833: Use PyErr_Format() and PyUnicode_FromFormat() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68796 diff changeset	330 PyErr_SetString(PyExc_TypeError, message);
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	331 return cleanreturn(0, &freelist);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	332 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	333
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	334 for (i = 0; i < len; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	335 if (*format == '\|')
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	336 format++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	337 msg = convertitem(PyTuple_GET_ITEM(args, i), &format, p_va,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	338 flags, levels, msgbuf,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	339 sizeof(msgbuf), &freelist);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	340 if (msg) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	341 seterror(i+1, msg, levels, fname, msg);
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	342 return cleanreturn(0, &freelist);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	343 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	344 }
6805 93e480dedcf0 Add explicit check for correct next character in format at end of Guido van Rossum <guido@python.org> parents: 5410 diff changeset	345
82110 38830281d43b Issue #17173: Remove uses of locale-dependent C functions (isalpha() etc.) in the interpreter. Antoine Pitrou <solipsis@pitrou.net> parents: 78949 diff changeset	346 if (format != '\0' && !Py_ISALPHA(Py_CHARMASK(format)) &&
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	347 *format != '(' &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	348 format != '\|' && format != ':' && *format != ';') {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	349 PyErr_Format(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	350 "bad format string: %.200s", formatsave);
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	351 return cleanreturn(0, &freelist);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	352 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	353
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	354 return cleanreturn(1, &freelist);
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	355 }
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	356
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	357
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	358
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	359 static void
83802 ef5dd5bda323 Fix compilater warnings on Windows 64-bit Victor Stinner <victor.stinner@gmail.com> parents: 82233 diff changeset	360 seterror(Py_ssize_t iarg, const char msg, int levels, const char *fname,
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35552 diff changeset	361 const char *message)
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	362 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	363 char buf[512];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	364 int i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	365 char *p = buf;
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	366
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	367 if (PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	368 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	369 else if (message == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	370 if (fname != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	371 PyOS_snprintf(p, sizeof(buf), "%.200s() ", fname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	372 p += strlen(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	373 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	374 if (iarg != 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	375 PyOS_snprintf(p, sizeof(buf) - (p - buf),
83829 0648e7fe7a72 Use PY_FORMAT_SIZE_T because Visual Studio does not understand %zd format. Richard Oudkerk <shibturn@gmail.com> parents: 83802 diff changeset	376 "argument %" PY_FORMAT_SIZE_T "d", iarg);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	377 i = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	378 p += strlen(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	379 while (levels[i] > 0 && i < 32 && (int)(p-buf) < 220) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	380 PyOS_snprintf(p, sizeof(buf) - (p - buf),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	381 ", item %d", levels[i]-1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	382 p += strlen(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	383 i++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	384 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	385 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	386 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	387 PyOS_snprintf(p, sizeof(buf) - (p - buf), "argument");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	388 p += strlen(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	389 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	390 PyOS_snprintf(p, sizeof(buf) - (p - buf), " %.256s", msg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	391 message = buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	392 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	393 PyErr_SetString(PyExc_TypeError, message);
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	394 }
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	395
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	396
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	397 /* Convert a tuple argument.
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	398 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	399 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	400 If successful:
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	401 p_format and p_va are updated,
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	402 levels and msgbuf are untouched,
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	403 and NULL is returned.
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	404 If the argument is invalid:
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	405 *p_format is unchanged,
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	406 *p_va is undefined,
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	407 *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	408 *msgbuf contains an error message, whose format is:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	409 "must be <typename1>, not <typename2>", where:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	410 <typename1> is the name of the expected type, and
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	411 <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	412 and msgbuf is returned.
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	413 */
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	414
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	415 static char *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	416 converttuple(PyObject arg, const char p_format, va_list p_va, int flags,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	417 int levels, char msgbuf, size_t bufsize, int toplevel,
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	418 freelist_t *freelist)
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	419 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	420 int level = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	421 int n = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	422 const char format = p_format;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	423 int i;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	424
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	425 for (;;) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	426 int c = *format++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	427 if (c == '(') {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	428 if (level == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	429 n++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	430 level++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	431 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	432 else if (c == ')') {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	433 if (level == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	434 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	435 level--;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	436 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	437 else if (c == ':' \|\| c == ';' \|\| c == '\0')
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	438 break;
82110 38830281d43b Issue #17173: Remove uses of locale-dependent C functions (isalpha() etc.) in the interpreter. Antoine Pitrou <solipsis@pitrou.net> parents: 78949 diff changeset	439 else if (level == 0 && Py_ISALPHA(Py_CHARMASK(c)))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	440 n++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	441 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	442
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	443 if (!PySequence_Check(arg) \|\| PyBytes_Check(arg)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	444 levels[0] = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	445 PyOS_snprintf(msgbuf, bufsize,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	446 toplevel ? "expected %d arguments, not %.50s" :
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	447 "must be %d-item sequence, not %.50s",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	448 n,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	449 arg == Py_None ? "None" : arg->ob_type->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	450 return msgbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	451 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	452
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	453 if ((i = PySequence_Size(arg)) != n) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	454 levels[0] = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	455 PyOS_snprintf(msgbuf, bufsize,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	456 toplevel ? "expected %d arguments, not %d" :
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	457 "must be sequence of length %d, not %d",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	458 n, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	459 return msgbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	460 }
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	461
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	462 format = *p_format;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	463 for (i = 0; i < n; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	464 char *msg;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	465 PyObject *item;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	466 item = PySequence_GetItem(arg, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	467 if (item == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	468 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	469 levels[0] = i+1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	470 levels[1] = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	471 strncpy(msgbuf, "is not retrievable", bufsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	472 return msgbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	473 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	474 msg = convertitem(item, &format, p_va, flags, levels+1,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	475 msgbuf, bufsize, freelist);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	476 /* PySequence_GetItem calls tp->sq_item, which INCREFs */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	477 Py_XDECREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	478 if (msg != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	479 levels[0] = i+1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	480 return msg;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	481 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	482 }
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	483
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	484 *p_format = format;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	485 return NULL;
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	486 }
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	487
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	488
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	489 /* Convert a single item. */
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	490
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	491 static char *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	492 convertitem(PyObject arg, const char p_format, va_list p_va, int flags,
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	493 int levels, char msgbuf, size_t bufsize, freelist_t *freelist)
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	494 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	495 char *msg;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	496 const char format = p_format;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	497
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	498 if (format == '(' / ')' */) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	499 format++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	500 msg = converttuple(arg, &format, p_va, flags, levels, msgbuf,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	501 bufsize, 0, freelist);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	502 if (msg == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	503 format++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	504 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	505 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	506 msg = convertsimple(arg, &format, p_va, flags,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	507 msgbuf, bufsize, freelist);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	508 if (msg != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	509 levels[0] = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	510 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	511 if (msg == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	512 *p_format = format;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	513 return msg;
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	514 }
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	515
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	516
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	517
17996 5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	518 /* 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	519
8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	520 static char *
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35552 diff changeset	521 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	522 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	523 assert(expected != NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	524 assert(arg != NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	525 PyOS_snprintf(msgbuf, bufsize,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	526 "must be %.50s, not %.50s", expected,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	527 arg == Py_None ? "None" : arg->ob_type->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	528 return msgbuf;
17996 5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	529 }
5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	530
5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	531 #define CONV_UNICODE "(unicode conversion error)"
5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	532
36988 49c6eb688906 Checkpoint. 218 tests are okay; 53 are failing. Done so far: Guido van Rossum <guido@python.org> parents: 36773 diff changeset	533 /* Explicitly check for float arguments when integers are expected.
49c6eb688906 Checkpoint. 218 tests are okay; 53 are failing. Done so far: Guido van Rossum <guido@python.org> parents: 36773 diff changeset	534 Return 1 for error, 0 if ok. */
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	535 static int
9e47f9ed49f6 If a float is passed where a int is expected, issue a DeprecationWarning Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 27363 diff changeset	536 float_argument_error(PyObject *arg)
9e47f9ed49f6 If a float is passed where a int is expected, issue a DeprecationWarning Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 27363 diff changeset	537 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	538 if (PyFloat_Check(arg)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	539 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	540 "integer argument expected, got float" );
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	541 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	542 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	543 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	544 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	545 }
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
17996 5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	547 /* 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	548 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	549 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	550 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	551 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	552
9b7d117eb4bc Complete format code support in getargs.c::skipitem(), which is called when Georg Brandl <georg@python.org> parents: 35449 diff changeset	553 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	554 */
5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	555
5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	556 static char *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	557 convertsimple(PyObject arg, const char p_format, va_list p_va, int flags,
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	558 char msgbuf, size_t bufsize, freelist_t freelist)
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	559 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	560 /* For # codes */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	561 #define FETCH_SIZE int q=NULL;Py_ssize_t q2=NULL;\
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	562 if (flags & FLAG_SIZE_T) q2=va_arg(p_va, Py_ssize_t); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	563 else q=va_arg(p_va, int);
68794 d9633064458c Issue #8651: PyArg_Parse() functions raise an OverflowError if the file Victor Stinner <victor.stinner@haypocalc.com>* parents: 62483 diff changeset	564 #define STORE_SIZE(s) \
d9633064458c Issue #8651: PyArg_Parse() functions raise an OverflowError if the file Victor Stinner <victor.stinner@haypocalc.com>* parents: 62483 diff changeset	565 if (flags & FLAG_SIZE_T) \
d9633064458c Issue #8651: PyArg_Parse() functions raise an OverflowError if the file Victor Stinner <victor.stinner@haypocalc.com>* parents: 62483 diff changeset	566 *q2=s; \
d9633064458c Issue #8651: PyArg_Parse() functions raise an OverflowError if the file Victor Stinner <victor.stinner@haypocalc.com>* parents: 62483 diff changeset	567 else { \
d9633064458c Issue #8651: PyArg_Parse() functions raise an OverflowError if the file Victor Stinner <victor.stinner@haypocalc.com>* parents: 62483 diff changeset	568 if (INT_MAX < s) { \
d9633064458c Issue #8651: PyArg_Parse() functions raise an OverflowError if the file Victor Stinner <victor.stinner@haypocalc.com>* parents: 62483 diff changeset	569 PyErr_SetString(PyExc_OverflowError, \
d9633064458c Issue #8651: PyArg_Parse() functions raise an OverflowError if the file Victor Stinner <victor.stinner@haypocalc.com>* parents: 62483 diff changeset	570 "size does not fit in an int"); \
d9633064458c Issue #8651: PyArg_Parse() functions raise an OverflowError if the file Victor Stinner <victor.stinner@haypocalc.com>* parents: 62483 diff changeset	571 return converterr("", arg, msgbuf, bufsize); \
d9633064458c Issue #8651: PyArg_Parse() functions raise an OverflowError if the file Victor Stinner <victor.stinner@haypocalc.com>* parents: 62483 diff changeset	572 } \
84035 aeebbae8c74c Issue #9566: Fix compilater warnings on Windows 64-bit Victor Stinner <victor.stinner@gmail.com> parents: 83829 diff changeset	573 *q = (int)s; \
68794 d9633064458c Issue #8651: PyArg_Parse() functions raise an OverflowError if the file Victor Stinner <victor.stinner@haypocalc.com>* parents: 62483 diff changeset	574 }
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	575 #define BUFFER_LEN ((flags & FLAG_SIZE_T) ? q2:q)
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	576 #define RETURN_ERR_OCCURRED return msgbuf
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	577
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	578 const char format = p_format;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	579 char c = *format++;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71543 diff changeset	580 char *sarg;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	581
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	582 switch (c) {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	583
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	584 case 'b': { /* unsigned byte -- very short int */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	585 char p = va_arg(p_va, char *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	586 long ival;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	587 if (float_argument_error(arg))
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	588 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	589 ival = PyLong_AsLong(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	590 if (ival == -1 && PyErr_Occurred())
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	591 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	592 else if (ival < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	593 PyErr_SetString(PyExc_OverflowError,
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	594 "unsigned byte integer is less than minimum");
98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	595 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	596 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	597 else if (ival > UCHAR_MAX) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	598 PyErr_SetString(PyExc_OverflowError,
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	599 "unsigned byte integer is greater than maximum");
98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	600 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	601 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	602 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	603 *p = (unsigned char) ival;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	604 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	605 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	606
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	607 case 'B': {/* byte sized bitfield - both signed and unsigned
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	608 values allowed */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	609 char p = va_arg(p_va, char *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	610 long ival;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	611 if (float_argument_error(arg))
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	612 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	613 ival = PyLong_AsUnsignedLongMask(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	614 if (ival == -1 && PyErr_Occurred())
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	615 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	616 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	617 *p = (unsigned char) ival;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	618 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	619 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	620
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	621 case 'h': {/* signed short int */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	622 short p = va_arg(p_va, short *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	623 long ival;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	624 if (float_argument_error(arg))
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	625 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	626 ival = PyLong_AsLong(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	627 if (ival == -1 && PyErr_Occurred())
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	628 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	629 else if (ival < SHRT_MIN) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	630 PyErr_SetString(PyExc_OverflowError,
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	631 "signed short integer is less than minimum");
98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	632 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	633 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	634 else if (ival > SHRT_MAX) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	635 PyErr_SetString(PyExc_OverflowError,
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	636 "signed short integer is greater than maximum");
98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	637 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	638 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	639 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	640 *p = (short) ival;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	641 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	642 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	643
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	644 case 'H': { /* short int sized bitfield, both signed and
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	645 unsigned allowed */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	646 unsigned short p = va_arg(p_va, unsigned short *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	647 long ival;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	648 if (float_argument_error(arg))
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	649 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	650 ival = PyLong_AsUnsignedLongMask(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	651 if (ival == -1 && PyErr_Occurred())
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	652 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	653 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	654 *p = (unsigned short) ival;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	655 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	656 }
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	657
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	658 case 'i': {/* signed int */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	659 int p = va_arg(p_va, int *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	660 long ival;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	661 if (float_argument_error(arg))
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	662 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	663 ival = PyLong_AsLong(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	664 if (ival == -1 && PyErr_Occurred())
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	665 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	666 else if (ival > INT_MAX) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	667 PyErr_SetString(PyExc_OverflowError,
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	668 "signed integer is greater than maximum");
98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	669 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	670 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	671 else if (ival < INT_MIN) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	672 PyErr_SetString(PyExc_OverflowError,
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	673 "signed integer is less than minimum");
98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	674 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	675 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	676 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	677 *p = ival;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	678 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	679 }
17996 5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	680
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	681 case 'I': { /* int sized bitfield, both signed and
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	682 unsigned allowed */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	683 unsigned int p = va_arg(p_va, unsigned int *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	684 unsigned int ival;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	685 if (float_argument_error(arg))
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	686 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	687 ival = (unsigned int)PyLong_AsUnsignedLongMask(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	688 if (ival == (unsigned int)-1 && PyErr_Occurred())
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	689 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	690 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	691 *p = ival;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	692 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	693 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	694
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	695 case 'n': /* Py_ssize_t */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	696 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	697 PyObject *iobj;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	698 Py_ssize_t p = va_arg(p_va, Py_ssize_t *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	699 Py_ssize_t ival = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	700 if (float_argument_error(arg))
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	701 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	702 iobj = PyNumber_Index(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	703 if (iobj != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	704 ival = PyLong_AsSsize_t(iobj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	705 Py_DECREF(iobj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	706 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	707 if (ival == -1 && PyErr_Occurred())
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	708 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	709 *p = ival;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	710 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	711 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	712 case 'l': {/* long int */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	713 long p = va_arg(p_va, long *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	714 long ival;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	715 if (float_argument_error(arg))
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	716 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	717 ival = PyLong_AsLong(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	718 if (ival == -1 && PyErr_Occurred())
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	719 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	720 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	721 *p = ival;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	722 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	723 }
28652 28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	724
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	725 case 'k': { /* long sized bitfield */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	726 unsigned long p = va_arg(p_va, unsigned long *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	727 unsigned long ival;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	728 if (PyLong_Check(arg))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	729 ival = PyLong_AsUnsignedLongMask(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	730 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	731 return converterr("integer<k>", arg, msgbuf, bufsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	732 *p = ival;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	733 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	734 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	735
9949 98e37347378b Change rare occurrences of #if HAVE_LONG_LONG to #ifdef. Guido van Rossum <guido@python.org> parents: 9306 diff changeset	736 #ifdef HAVE_LONG_LONG
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	737 case 'L': {/* PY_LONG_LONG */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	738 PY_LONG_LONG p = va_arg( p_va, PY_LONG_LONG * );
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60931 diff changeset	739 PY_LONG_LONG ival;
62221 fe5ed70283ef Issue #8950: Make PyArg_Parse* with 'L' code raise for float inputs, Mark Dickinson <dickinsm@gmail.com> parents: 62202 diff changeset	740 if (float_argument_error(arg))
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	741 RETURN_ERR_OCCURRED;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60931 diff changeset	742 ival = PyLong_AsLongLong(arg);
62221 fe5ed70283ef Issue #8950: Make PyArg_Parse* with 'L' code raise for float inputs, Mark Dickinson <dickinsm@gmail.com> parents: 62202 diff changeset	743 if (ival == (PY_LONG_LONG)-1 && PyErr_Occurred())
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	744 RETURN_ERR_OCCURRED;
62221 fe5ed70283ef Issue #8950: Make PyArg_Parse* with 'L' code raise for float inputs, Mark Dickinson <dickinsm@gmail.com> parents: 62202 diff changeset	745 else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	746 *p = ival;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	747 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	748 }
28652 28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	749
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	750 case 'K': { /* long long sized bitfield */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	751 unsigned PY_LONG_LONG p = va_arg(p_va, unsigned PY_LONG_LONG *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	752 unsigned PY_LONG_LONG ival;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	753 if (PyLong_Check(arg))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	754 ival = PyLong_AsUnsignedLongLongMask(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	755 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	756 return converterr("integer<K>", arg, msgbuf, bufsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	757 *p = ival;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	758 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	759 }
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8358 diff changeset	760 #endif
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	761
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	762 case 'f': {/* float */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	763 float p = va_arg(p_va, float *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	764 double dval = PyFloat_AsDouble(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	765 if (PyErr_Occurred())
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	766 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	767 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	768 *p = (float) dval;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	769 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	770 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	771
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	772 case 'd': {/* double */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	773 double p = va_arg(p_va, double *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	774 double dval = PyFloat_AsDouble(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	775 if (PyErr_Occurred())
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	776 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	777 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	778 *p = dval;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	779 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	780 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	781
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	782 case 'D': {/* complex double */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	783 Py_complex p = va_arg(p_va, Py_complex *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	784 Py_complex cval;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	785 cval = PyComplex_AsCComplex(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	786 if (PyErr_Occurred())
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	787 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	788 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	789 *p = cval;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	790 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	791 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	792
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	793 case 'c': {/* char */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	794 char p = va_arg(p_va, char *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	795 if (PyBytes_Check(arg) && PyBytes_Size(arg) == 1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	796 *p = PyBytes_AS_STRING(arg)[0];
71543 536fccc75f5a Issue #12380: PyArg_ParseTuple now accepts a bytearray for the 'c' format. Eli Bendersky <eliben@gmail.com> parents: 68809 diff changeset	797 else if (PyByteArray_Check(arg) && PyByteArray_Size(arg) == 1)
536fccc75f5a Issue #12380: PyArg_ParseTuple now accepts a bytearray for the 'c' format. Eli Bendersky <eliben@gmail.com> parents: 68809 diff changeset	798 *p = PyByteArray_AS_STRING(arg)[0];
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	799 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	800 return converterr("a byte string of length 1", arg, msgbuf, bufsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	801 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	802 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	803
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	804 case 'C': {/* unicode char */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	805 int p = va_arg(p_va, int *);
72679 b66033a0f140 Fix usage og PyUnicode_READY() Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	806 int kind;
b66033a0f140 Fix usage og PyUnicode_READY() Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	807 void *data;
b66033a0f140 Fix usage og PyUnicode_READY() Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	808
b66033a0f140 Fix usage og PyUnicode_READY() Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	809 if (!PyUnicode_Check(arg))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	810 return converterr("a unicode character", arg, msgbuf, bufsize);
72679 b66033a0f140 Fix usage og PyUnicode_READY() Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	811
b66033a0f140 Fix usage og PyUnicode_READY() Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	812 if (PyUnicode_READY(arg))
b66033a0f140 Fix usage og PyUnicode_READY() Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	813 RETURN_ERR_OCCURRED;
b66033a0f140 Fix usage og PyUnicode_READY() Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	814
b66033a0f140 Fix usage og PyUnicode_READY() Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	815 if (PyUnicode_GET_LENGTH(arg) != 1)
b66033a0f140 Fix usage og PyUnicode_READY() Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	816 return converterr("a unicode character", arg, msgbuf, bufsize);
b66033a0f140 Fix usage og PyUnicode_READY() Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	817
b66033a0f140 Fix usage og PyUnicode_READY() Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	818 kind = PyUnicode_KIND(arg);
b66033a0f140 Fix usage og PyUnicode_READY() Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	819 data = PyUnicode_DATA(arg);
b66033a0f140 Fix usage og PyUnicode_READY() Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	820 *p = PyUnicode_READ(kind, data, 0);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	821 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	822 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	823
76776 bc6d28e726d8 Issue #14705: Add 'p' format character to PyArg_ParseTuple* for bool support. Larry Hastings <larry@hastings.org> parents: 75842 diff changeset	824 case 'p': {/* boolean predicate */
bc6d28e726d8 Issue #14705: Add 'p' format character to PyArg_ParseTuple* for bool support. Larry Hastings <larry@hastings.org> parents: 75842 diff changeset	825 int p = va_arg(p_va, int *);
bc6d28e726d8 Issue #14705: Add 'p' format character to PyArg_ParseTuple* for bool support. Larry Hastings <larry@hastings.org> parents: 75842 diff changeset	826 int val = PyObject_IsTrue(arg);
bc6d28e726d8 Issue #14705: Add 'p' format character to PyArg_ParseTuple* for bool support. Larry Hastings <larry@hastings.org> parents: 75842 diff changeset	827 if (val > 0)
bc6d28e726d8 Issue #14705: Add 'p' format character to PyArg_ParseTuple* for bool support. Larry Hastings <larry@hastings.org> parents: 75842 diff changeset	828 *p = 1;
bc6d28e726d8 Issue #14705: Add 'p' format character to PyArg_ParseTuple* for bool support. Larry Hastings <larry@hastings.org> parents: 75842 diff changeset	829 else if (val == 0)
bc6d28e726d8 Issue #14705: Add 'p' format character to PyArg_ParseTuple* for bool support. Larry Hastings <larry@hastings.org> parents: 75842 diff changeset	830 *p = 0;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	831 else
76776 bc6d28e726d8 Issue #14705: Add 'p' format character to PyArg_ParseTuple* for bool support. Larry Hastings <larry@hastings.org> parents: 75842 diff changeset	832 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	833 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	834 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	835
62202 d7113cacd428 Issue #8838, #8339: Remove codecs.charbuffer_encode() and "t#" parsing format Victor Stinner <victor.stinner@haypocalc.com> parents: 62197 diff changeset	836 /* XXX WAAAAH! 's', 'y', 'z', 'u', 'Z', 'e', 'w' codes all
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	837 need to be cleaned up! */
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	838
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	839 case 'y': {/* any buffer-like object, but not PyUnicode */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	840 void p = (void )va_arg(p_va, char *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	841 char *buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	842 Py_ssize_t count;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	843 if (format == '') {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	844 if (getbuffer(arg, (Py_buffer*)p, &buf) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	845 return converterr(buf, arg, msgbuf, bufsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	846 format++;
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	847 if (addcleanup(p, freelist, cleanup_buffer)) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	848 return converterr(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	849 "(cleanup problem)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	850 arg, msgbuf, bufsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	851 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	852 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	853 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	854 count = convertbuffer(arg, p, &buf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	855 if (count < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	856 return converterr(buf, arg, msgbuf, bufsize);
62322 b32a2816f6e9 Issue #8592: PyArg_Parse() functions raise a TypeError for "y", "u" and "Z" Victor Stinner <victor.stinner@haypocalc.com>* parents: 62221 diff changeset	857 if (*format == '#') {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	858 FETCH_SIZE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	859 STORE_SIZE(count);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	860 format++;
62322 b32a2816f6e9 Issue #8592: PyArg_Parse() functions raise a TypeError for "y", "u" and "Z" Victor Stinner <victor.stinner@haypocalc.com>* parents: 62221 diff changeset	861 } else {
b32a2816f6e9 Issue #8592: PyArg_Parse() functions raise a TypeError for "y", "u" and "Z" Victor Stinner <victor.stinner@haypocalc.com>* parents: 62221 diff changeset	862 if (strlen(*p) != count)
b32a2816f6e9 Issue #8592: PyArg_Parse() functions raise a TypeError for "y", "u" and "Z" Victor Stinner <victor.stinner@haypocalc.com>* parents: 62221 diff changeset	863 return converterr(
b32a2816f6e9 Issue #8592: PyArg_Parse() functions raise a TypeError for "y", "u" and "Z" Victor Stinner <victor.stinner@haypocalc.com>* parents: 62221 diff changeset	864 "bytes without null bytes",
b32a2816f6e9 Issue #8592: PyArg_Parse() functions raise a TypeError for "y", "u" and "Z" Victor Stinner <victor.stinner@haypocalc.com>* parents: 62221 diff changeset	865 arg, msgbuf, bufsize);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	866 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	867 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	868 }
41611 c48fe4dc34a9 Change UnicodeDecodeError objects so that the 'object' attribute Walter Dörwald <walter@livinglogic.de> parents: 41596 diff changeset	869
62478 893970141608 PyArg_Parse() functions: factorize code for s/z and u/Z formats Victor Stinner <victor.stinner@haypocalc.com>* parents: 62476 diff changeset	870 case 's': /* text string */
893970141608 PyArg_Parse() functions: factorize code for s/z and u/Z formats Victor Stinner <victor.stinner@haypocalc.com>* parents: 62476 diff changeset	871 case 'z': /* text string or None */
893970141608 PyArg_Parse() functions: factorize code for s/z and u/Z formats Victor Stinner <victor.stinner@haypocalc.com>* parents: 62476 diff changeset	872 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	873 if (format == '') {
62478 893970141608 PyArg_Parse() functions: factorize code for s/z and u/Z formats Victor Stinner <victor.stinner@haypocalc.com>* parents: 62476 diff changeset	874 /* "s" or "z" */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	875 Py_buffer p = (Py_buffer )va_arg(p_va, Py_buffer );
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48660 diff changeset	876
62478 893970141608 PyArg_Parse() functions: factorize code for s/z and u/Z formats Victor Stinner <victor.stinner@haypocalc.com>* parents: 62476 diff changeset	877 if (c == 'z' && arg == Py_None)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	878 PyBuffer_FillInfo(p, NULL, NULL, 0, 1, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	879 else if (PyUnicode_Check(arg)) {
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71543 diff changeset	880 Py_ssize_t len;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71543 diff changeset	881 sarg = PyUnicode_AsUTF8AndSize(arg, &len);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71543 diff changeset	882 if (sarg == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	883 return converterr(CONV_UNICODE,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	884 arg, msgbuf, bufsize);
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71543 diff changeset	885 PyBuffer_FillInfo(p, arg, sarg, len, 1, 0);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	886 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	887 else { /* any buffer-like object */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	888 char *buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	889 if (getbuffer(arg, p, &buf) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	890 return converterr(buf, arg, msgbuf, bufsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	891 }
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	892 if (addcleanup(p, freelist, cleanup_buffer)) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	893 return converterr(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	894 "(cleanup problem)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	895 arg, msgbuf, bufsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	896 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	897 format++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	898 } else if (format == '#') { / any buffer-like object */
62478 893970141608 PyArg_Parse() functions: factorize code for s/z and u/Z formats Victor Stinner <victor.stinner@haypocalc.com>* parents: 62476 diff changeset	899 /* "s#" or "z#" */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	900 void p = (void )va_arg(p_va, char *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	901 FETCH_SIZE;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	902
62478 893970141608 PyArg_Parse() functions: factorize code for s/z and u/Z formats Victor Stinner <victor.stinner@haypocalc.com>* parents: 62476 diff changeset	903 if (c == 'z' && arg == Py_None) {
893970141608 PyArg_Parse() functions: factorize code for s/z and u/Z formats Victor Stinner <victor.stinner@haypocalc.com>* parents: 62476 diff changeset	904 *p = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	905 STORE_SIZE(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	906 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	907 else if (PyUnicode_Check(arg)) {
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71543 diff changeset	908 Py_ssize_t len;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71543 diff changeset	909 sarg = PyUnicode_AsUTF8AndSize(arg, &len);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71543 diff changeset	910 if (sarg == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	911 return converterr(CONV_UNICODE,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	912 arg, msgbuf, bufsize);
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71543 diff changeset	913 *p = sarg;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71543 diff changeset	914 STORE_SIZE(len);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	915 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	916 else { /* any buffer-like object */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	917 /* XXX Really? */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	918 char *buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	919 Py_ssize_t count = convertbuffer(arg, p, &buf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	920 if (count < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	921 return converterr(buf, arg, msgbuf, bufsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	922 STORE_SIZE(count);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	923 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	924 format++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	925 } else {
62478 893970141608 PyArg_Parse() functions: factorize code for s/z and u/Z formats Victor Stinner <victor.stinner@haypocalc.com>* parents: 62476 diff changeset	926 /* "s" or "z" */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	927 char *p = va_arg(p_va, char **);
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71543 diff changeset	928 Py_ssize_t len;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71543 diff changeset	929 sarg = NULL;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	930
62478 893970141608 PyArg_Parse() functions: factorize code for s/z and u/Z formats Victor Stinner <victor.stinner@haypocalc.com>* parents: 62476 diff changeset	931 if (c == 'z' && arg == Py_None)
893970141608 PyArg_Parse() functions: factorize code for s/z and u/Z formats Victor Stinner <victor.stinner@haypocalc.com>* parents: 62476 diff changeset	932 *p = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	933 else if (PyUnicode_Check(arg)) {
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71543 diff changeset	934 sarg = PyUnicode_AsUTF8AndSize(arg, &len);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71543 diff changeset	935 if (sarg == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	936 return converterr(CONV_UNICODE,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	937 arg, msgbuf, bufsize);
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71543 diff changeset	938 *p = sarg;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	939 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	940 else
62478 893970141608 PyArg_Parse() functions: factorize code for s/z and u/Z formats Victor Stinner <victor.stinner@haypocalc.com>* parents: 62476 diff changeset	941 return converterr(c == 'z' ? "str or None" : "str",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	942 arg, msgbuf, bufsize);
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71543 diff changeset	943 if (p != NULL && sarg != NULL && (Py_ssize_t) strlen(p) != len)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	944 return converterr(
72915 9685f893fffe convertsimple(): "str without bytes" => "str without characters" Victor Stinner <victor.stinner@haypocalc.com> parents: 72861 diff changeset	945 c == 'z' ? "str without null characters or None"
9685f893fffe convertsimple(): "str without bytes" => "str without characters" Victor Stinner <victor.stinner@haypocalc.com> parents: 72861 diff changeset	946 : "str without null characters",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	947 arg, msgbuf, bufsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	948 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	949 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	950 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	951
62478 893970141608 PyArg_Parse() functions: factorize code for s/z and u/Z formats Victor Stinner <victor.stinner@haypocalc.com>* parents: 62476 diff changeset	952 case 'u': /* raw unicode buffer (Py_UNICODE ) /
893970141608 PyArg_Parse() functions: factorize code for s/z and u/Z formats Victor Stinner <victor.stinner@haypocalc.com>* parents: 62476 diff changeset	953 case 'Z': /* raw unicode buffer or None */
893970141608 PyArg_Parse() functions: factorize code for s/z and u/Z formats Victor Stinner <victor.stinner@haypocalc.com>* parents: 62476 diff changeset	954 {
68102 e2f96bd29252 Issue #8914: fix various warnings from the Clang static analyzer v254. Brett Cannon <bcannon@gmail.com> parents: 67346 diff changeset	955 Py_UNICODE *p = va_arg(p_va, Py_UNICODE **);
e2f96bd29252 Issue #8914: fix various warnings from the Clang static analyzer v254. Brett Cannon <bcannon@gmail.com> parents: 67346 diff changeset	956
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	957 if (format == '#') { / any buffer-like object */
62478 893970141608 PyArg_Parse() functions: factorize code for s/z and u/Z formats Victor Stinner <victor.stinner@haypocalc.com>* parents: 62476 diff changeset	958 /* "s#" or "Z#" */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	959 FETCH_SIZE;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	960
62478 893970141608 PyArg_Parse() functions: factorize code for s/z and u/Z formats Victor Stinner <victor.stinner@haypocalc.com>* parents: 62476 diff changeset	961 if (c == 'Z' && arg == Py_None) {
893970141608 PyArg_Parse() functions: factorize code for s/z and u/Z formats Victor Stinner <victor.stinner@haypocalc.com>* parents: 62476 diff changeset	962 *p = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	963 STORE_SIZE(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	964 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	965 else if (PyUnicode_Check(arg)) {
72861 6358e5d29dea Use PyUnicode_AsUnicodeAndSize() instead of PyUnicode_GET_SIZE() Victor Stinner <victor.stinner@haypocalc.com> parents: 72679 diff changeset	966 Py_ssize_t len;
6358e5d29dea Use PyUnicode_AsUnicodeAndSize() instead of PyUnicode_GET_SIZE() Victor Stinner <victor.stinner@haypocalc.com> parents: 72679 diff changeset	967 *p = PyUnicode_AsUnicodeAndSize(arg, &len);
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71543 diff changeset	968 if (*p == NULL)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71543 diff changeset	969 RETURN_ERR_OCCURRED;
72861 6358e5d29dea Use PyUnicode_AsUnicodeAndSize() instead of PyUnicode_GET_SIZE() Victor Stinner <victor.stinner@haypocalc.com> parents: 72679 diff changeset	970 STORE_SIZE(len);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	971 }
62198 b2c1995633bd Merged revisions 81849 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	972 else
b2c1995633bd Merged revisions 81849 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	973 return converterr("str or None", arg, msgbuf, bufsize);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	974 format++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	975 } else {
62478 893970141608 PyArg_Parse() functions: factorize code for s/z and u/Z formats Victor Stinner <victor.stinner@haypocalc.com>* parents: 62476 diff changeset	976 /* "s" or "Z" */
893970141608 PyArg_Parse() functions: factorize code for s/z and u/Z formats Victor Stinner <victor.stinner@haypocalc.com>* parents: 62476 diff changeset	977 if (c == 'Z' && arg == Py_None)
893970141608 PyArg_Parse() functions: factorize code for s/z and u/Z formats Victor Stinner <victor.stinner@haypocalc.com>* parents: 62476 diff changeset	978 *p = NULL;
62322 b32a2816f6e9 Issue #8592: PyArg_Parse() functions raise a TypeError for "y", "u" and "Z" Victor Stinner <victor.stinner@haypocalc.com>* parents: 62221 diff changeset	979 else if (PyUnicode_Check(arg)) {
72861 6358e5d29dea Use PyUnicode_AsUnicodeAndSize() instead of PyUnicode_GET_SIZE() Victor Stinner <victor.stinner@haypocalc.com> parents: 72679 diff changeset	980 Py_ssize_t len;
6358e5d29dea Use PyUnicode_AsUnicodeAndSize() instead of PyUnicode_GET_SIZE() Victor Stinner <victor.stinner@haypocalc.com> parents: 72679 diff changeset	981 *p = PyUnicode_AsUnicodeAndSize(arg, &len);
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71543 diff changeset	982 if (*p == NULL)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71543 diff changeset	983 RETURN_ERR_OCCURRED;
72861 6358e5d29dea Use PyUnicode_AsUnicodeAndSize() instead of PyUnicode_GET_SIZE() Victor Stinner <victor.stinner@haypocalc.com> parents: 72679 diff changeset	984 if (Py_UNICODE_strlen(*p) != len)
62322 b32a2816f6e9 Issue #8592: PyArg_Parse() functions raise a TypeError for "y", "u" and "Z" Victor Stinner <victor.stinner@haypocalc.com>* parents: 62221 diff changeset	985 return converterr(
72915 9685f893fffe convertsimple(): "str without bytes" => "str without characters" Victor Stinner <victor.stinner@haypocalc.com> parents: 72861 diff changeset	986 "str without null characters or None",
62322 b32a2816f6e9 Issue #8592: PyArg_Parse() functions raise a TypeError for "y", "u" and "Z" Victor Stinner <victor.stinner@haypocalc.com>* parents: 62221 diff changeset	987 arg, msgbuf, bufsize);
b32a2816f6e9 Issue #8592: PyArg_Parse() functions raise a TypeError for "y", "u" and "Z" Victor Stinner <victor.stinner@haypocalc.com>* parents: 62221 diff changeset	988 } else
62478 893970141608 PyArg_Parse() functions: factorize code for s/z and u/Z formats Victor Stinner <victor.stinner@haypocalc.com>* parents: 62476 diff changeset	989 return converterr(c == 'Z' ? "str or None" : "str",
893970141608 PyArg_Parse() functions: factorize code for s/z and u/Z formats Victor Stinner <victor.stinner@haypocalc.com>* parents: 62476 diff changeset	990 arg, msgbuf, bufsize);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	991 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	992 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	993 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	994
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	995 case 'e': {/* encoded string */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	996 char **buffer;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	997 const char *encoding;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	998 PyObject *s;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	999 int recode_strings;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1000 Py_ssize_t size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1001 const char *ptr;
12051 d89556c04ef9 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11975 diff changeset	1002
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1003 /* Get 'e' parameter: the encoding name */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1004 encoding = (const char )va_arg(p_va, const char *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1005 if (encoding == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1006 encoding = PyUnicode_GetDefaultEncoding();
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	1007
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1008 /* Get output buffer parameter:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1009 's' (recode all objects via Unicode) or
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1010 't' (only recode non-string objects)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1011 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1012 if (*format == 's')
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1013 recode_strings = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1014 else if (*format == 't')
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1015 recode_strings = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1016 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1017 return converterr(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1018 "(unknown parser marker combination)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1019 arg, msgbuf, bufsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1020 buffer = (char *)va_arg(p_va, char **);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1021 format++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1022 if (buffer == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1023 return converterr("(buffer is NULL)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1024 arg, msgbuf, bufsize);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	1025
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1026 /* Encode object */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1027 if (!recode_strings &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1028 (PyBytes_Check(arg) \|\| PyByteArray_Check(arg))) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1029 s = arg;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1030 Py_INCREF(s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1031 if (PyObject_AsCharBuffer(s, &ptr, &size) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1032 return converterr("(AsCharBuffer failed)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1033 arg, msgbuf, bufsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1034 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1035 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1036 PyObject *u;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18887 diff changeset	1037
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1038 /* Convert object to Unicode */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1039 u = PyUnicode_FromObject(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1040 if (u == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1041 return converterr(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1042 "string or unicode or text buffer",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1043 arg, msgbuf, bufsize);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	1044
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1045 /* Encode object; use default error handling */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1046 s = PyUnicode_AsEncodedString(u,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1047 encoding,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1048 NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1049 Py_DECREF(u);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1050 if (s == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1051 return converterr("(encoding failed)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1052 arg, msgbuf, bufsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1053 if (!PyBytes_Check(s)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1054 Py_DECREF(s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1055 return converterr(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1056 "(encoder failed to return bytes)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1057 arg, msgbuf, bufsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1058 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1059 size = PyBytes_GET_SIZE(s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1060 ptr = PyBytes_AS_STRING(s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1061 if (ptr == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1062 ptr = "";
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1063 }
12051 d89556c04ef9 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11975 diff changeset	1064
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1065 /* Write output; output is guaranteed to be 0-terminated */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1066 if (*format == '#') {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1067 /* Using buffer length parameter '#':
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	1068
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1069 - if *buffer is NULL, a new buffer of the
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1070 needed size is allocated and the data
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1071 copied into it; *buffer is updated to point
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1072 to the new buffer; the caller is
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1073 responsible for PyMem_Free()ing it after
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1074 usage
12051 d89556c04ef9 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11975 diff changeset	1075
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1076 - if *buffer is not NULL, the data is
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1077 copied to buffer; buffer_len has to be
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1078 set to the size of the buffer on input;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1079 buffer overflow is signalled with an error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1080 buffer has to provide enough room for the
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1081 encoded string plus the trailing 0-byte
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	1082
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1083 - in both cases, *buffer_len is updated to
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1084 the size of the buffer /excluding/ the
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1085 trailing 0-byte
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	1086
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1087 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1088 FETCH_SIZE;
12051 d89556c04ef9 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 11975 diff changeset	1089
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1090 format++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1091 if (q == NULL && q2 == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1092 Py_DECREF(s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1093 return converterr(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1094 "(buffer_len is NULL)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1095 arg, msgbuf, bufsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1096 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1097 if (*buffer == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1098 *buffer = PyMem_NEW(char, size + 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1099 if (*buffer == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1100 Py_DECREF(s);
62151 c3f2ed4d8e65 convertsimple(): call PyErr_NoMemory() on PyMem_NEW() failure Victor Stinner <victor.stinner@haypocalc.com> parents: 62149 diff changeset	1101 PyErr_NoMemory();
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	1102 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1103 }
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	1104 if (addcleanup(*buffer, freelist, cleanup_ptr)) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1105 Py_DECREF(s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1106 return converterr(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1107 "(cleanup problem)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1108 arg, msgbuf, bufsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1109 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1110 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1111 if (size + 1 > BUFFER_LEN) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1112 Py_DECREF(s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1113 return converterr(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1114 "(buffer overflow)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1115 arg, msgbuf, bufsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1116 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1117 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1118 memcpy(*buffer, ptr, size+1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1119 STORE_SIZE(size);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1120 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1121 /* Using a 0-terminated buffer:
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	1122
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1123 - the encoded string has to be 0-terminated
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1124 for this variant to work; if it is not, an
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1125 error raised
17996 5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	1126
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1127 - a new buffer of the needed size is
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1128 allocated and the data copied into it;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1129 *buffer is updated to point to the new
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1130 buffer; the caller is responsible for
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1131 PyMem_Free()ing it after usage
17996 5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	1132
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1133 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1134 if ((Py_ssize_t)strlen(ptr) != size) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1135 Py_DECREF(s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1136 return converterr(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1137 "encoded string without NULL bytes",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1138 arg, msgbuf, bufsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1139 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1140 *buffer = PyMem_NEW(char, size + 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1141 if (*buffer == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1142 Py_DECREF(s);
62151 c3f2ed4d8e65 convertsimple(): call PyErr_NoMemory() on PyMem_NEW() failure Victor Stinner <victor.stinner@haypocalc.com> parents: 62149 diff changeset	1143 PyErr_NoMemory();
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	1144 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1145 }
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	1146 if (addcleanup(*buffer, freelist, cleanup_ptr)) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1147 Py_DECREF(s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1148 return converterr("(cleanup problem)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1149 arg, msgbuf, bufsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1150 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1151 memcpy(*buffer, ptr, size+1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1152 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1153 Py_DECREF(s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1154 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1155 }
12570 3dbe41380266 Brian Hooper <brian_takashi@hotmail.com>: Fred Drake <fdrake@acm.org> parents: 12510 diff changeset	1156
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1157 case 'S': { /* PyBytes object */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1158 PyObject *p = va_arg(p_va, PyObject **);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1159 if (PyBytes_Check(arg))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1160 *p = arg;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1161 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1162 return converterr("bytes", arg, msgbuf, bufsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1163 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1164 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	1165
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1166 case 'Y': { /* PyByteArray object */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1167 PyObject *p = va_arg(p_va, PyObject **);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1168 if (PyByteArray_Check(arg))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1169 *p = arg;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1170 else
62198 b2c1995633bd Merged revisions 81849 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	1171 return converterr("bytearray", arg, msgbuf, bufsize);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1172 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1173 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	1174
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1175 case 'U': { /* PyUnicode object */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1176 PyObject *p = va_arg(p_va, PyObject **);
77222 1700fb28d2ab PyArg_Parse("U"): ensure that the Unicode string is ready Victor Stinner <victor.stinner@gmail.com>* parents: 76845 diff changeset	1177 if (PyUnicode_Check(arg)) {
1700fb28d2ab PyArg_Parse("U"): ensure that the Unicode string is ready Victor Stinner <victor.stinner@gmail.com>* parents: 76845 diff changeset	1178 if (PyUnicode_READY(arg) == -1)
1700fb28d2ab PyArg_Parse("U"): ensure that the Unicode string is ready Victor Stinner <victor.stinner@gmail.com>* parents: 76845 diff changeset	1179 RETURN_ERR_OCCURRED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1180 *p = arg;
77222 1700fb28d2ab PyArg_Parse("U"): ensure that the Unicode string is ready Victor Stinner <victor.stinner@gmail.com>* parents: 76845 diff changeset	1181 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1182 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1183 return converterr("str", arg, msgbuf, bufsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1184 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1185 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	1186
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1187 case 'O': { /* object */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1188 PyTypeObject *type;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1189 PyObject **p;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1190 if (*format == '!') {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1191 type = va_arg(p_va, PyTypeObject);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1192 p = va_arg(p_va, PyObject *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1193 format++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1194 if (PyType_IsSubtype(arg->ob_type, type))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1195 *p = arg;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1196 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1197 return converterr(type->tp_name, arg, msgbuf, bufsize);
8358 da4bdceeaad7 Another veeeeeery old patch... Guido van Rossum <guido@python.org> parents: 7982 diff changeset	1198
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1199 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1200 else if (*format == '&') {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1201 typedef int (converter)(PyObject , void *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1202 converter convert = va_arg(*p_va, converter);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1203 void addr = va_arg(p_va, void *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1204 int res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1205 format++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1206 if (! (res = (*convert)(arg, addr)))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1207 return converterr("(unspecified)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1208 arg, msgbuf, bufsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1209 if (res == Py_CLEANUP_SUPPORTED &&
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	1210 addcleanup(addr, freelist, convert) == -1)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1211 return converterr("(cleanup problem)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1212 arg, msgbuf, bufsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1213 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1214 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1215 p = va_arg(p_va, PyObject *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1216 *p = arg;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1217 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1218 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1219 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	1220
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	1221
62484 bcc0e825faa0 Issue #8850: Remove "w" and "w#" formats from PyArg_Parse() functions, use Victor Stinner <victor.stinner@haypocalc.com>* parents: 62482 diff changeset	1222 case 'w': { /* "w": memory buffer, read-write access /
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1223 void *p = va_arg(p_va, void **);
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48660 diff changeset	1224
62484 bcc0e825faa0 Issue #8850: Remove "w" and "w#" formats from PyArg_Parse() functions, use Victor Stinner <victor.stinner@haypocalc.com>* parents: 62482 diff changeset	1225 if (format != '')
bcc0e825faa0 Issue #8850: Remove "w" and "w#" formats from PyArg_Parse() functions, use Victor Stinner <victor.stinner@haypocalc.com>* parents: 62482 diff changeset	1226 return converterr(
bcc0e825faa0 Issue #8850: Remove "w" and "w#" formats from PyArg_Parse() functions, use Victor Stinner <victor.stinner@haypocalc.com>* parents: 62482 diff changeset	1227 "invalid use of 'w' format character",
bcc0e825faa0 Issue #8850: Remove "w" and "w#" formats from PyArg_Parse() functions, use Victor Stinner <victor.stinner@haypocalc.com>* parents: 62482 diff changeset	1228 arg, msgbuf, bufsize);
bcc0e825faa0 Issue #8850: Remove "w" and "w#" formats from PyArg_Parse() functions, use Victor Stinner <victor.stinner@haypocalc.com>* parents: 62482 diff changeset	1229 format++;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	1230
62484 bcc0e825faa0 Issue #8850: Remove "w" and "w#" formats from PyArg_Parse() functions, use Victor Stinner <victor.stinner@haypocalc.com>* parents: 62482 diff changeset	1231 /* Caller is interested in Py_buffer, and the object
bcc0e825faa0 Issue #8850: Remove "w" and "w#" formats from PyArg_Parse() functions, use Victor Stinner <victor.stinner@haypocalc.com>* parents: 62482 diff changeset	1232 supports it directly. */
bcc0e825faa0 Issue #8850: Remove "w" and "w#" formats from PyArg_Parse() functions, use Victor Stinner <victor.stinner@haypocalc.com>* parents: 62482 diff changeset	1233 if (PyObject_GetBuffer(arg, (Py_buffer*)p, PyBUF_WRITABLE) < 0) {
bcc0e825faa0 Issue #8850: Remove "w" and "w#" formats from PyArg_Parse() functions, use Victor Stinner <victor.stinner@haypocalc.com>* parents: 62482 diff changeset	1234 PyErr_Clear();
bcc0e825faa0 Issue #8850: Remove "w" and "w#" formats from PyArg_Parse() functions, use Victor Stinner <victor.stinner@haypocalc.com>* parents: 62482 diff changeset	1235 return converterr("read-write buffer", arg, msgbuf, bufsize);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1236 }
63259 ac7eb6eaef68 Issue #8991: convertbuffer() rejects discontigious buffers Victor Stinner <victor.stinner@haypocalc.com> parents: 62484 diff changeset	1237 if (!PyBuffer_IsContiguous((Py_buffer*)p, 'C')) {
ac7eb6eaef68 Issue #8991: convertbuffer() rejects discontigious buffers Victor Stinner <victor.stinner@haypocalc.com> parents: 62484 diff changeset	1238 PyBuffer_Release((Py_buffer*)p);
ac7eb6eaef68 Issue #8991: convertbuffer() rejects discontigious buffers Victor Stinner <victor.stinner@haypocalc.com> parents: 62484 diff changeset	1239 return converterr("contiguous buffer", arg, msgbuf, bufsize);
ac7eb6eaef68 Issue #8991: convertbuffer() rejects discontigious buffers Victor Stinner <victor.stinner@haypocalc.com> parents: 62484 diff changeset	1240 }
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	1241 if (addcleanup(p, freelist, cleanup_buffer)) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1242 return converterr(
62484 bcc0e825faa0 Issue #8850: Remove "w" and "w#" formats from PyArg_Parse() functions, use Victor Stinner <victor.stinner@haypocalc.com>* parents: 62482 diff changeset	1243 "(cleanup problem)",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1244 arg, msgbuf, bufsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1245 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1246 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1247 }
9306 79439e4e9976 Implement new format character 't#'. This is like s#, accepting an Guido van Rossum <guido@python.org> parents: 9044 diff changeset	1248
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1249 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1250 return converterr("impossible<bad format char>", arg, msgbuf, bufsize);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	1251
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1252 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	1253
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1254 *p_format = format;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1255 return NULL;
67346 98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	1256
98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	1257 #undef FETCH_SIZE
98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	1258 #undef STORE_SIZE
98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	1259 #undef BUFFER_LEN
98c8aa237fc1 Issue #8992: convertsimple() doesn't need to fill msgbuf if an error occurred Victor Stinner <victor.stinner@haypocalc.com> parents: 67345 diff changeset	1260 #undef RETURN_ERR_OCCURRED
1913 8623aa3915db * Python/{modsupport.c,getargs.c,Makefile.in}, Guido van Rossum <guido@python.org> parents: diff changeset	1261 }
4026 6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1262
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1263 static Py_ssize_t
20629 acc7e3b4d042 Style conformance: function name begins a new line consistently. Fred Drake <fdrake@acm.org> parents: 20371 diff changeset	1264 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	1265 {
62149 9d49b744078c Simplify getbuffer(): convertbuffer() fails anyway if bf_getbuffer is NULL Victor Stinner <victor.stinner@haypocalc.com> parents: 61972 diff changeset	1266 PyBufferProcs *pb = Py_TYPE(arg)->tp_as_buffer;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1267 Py_ssize_t count;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1268 Py_buffer view;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42139 diff changeset	1269
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1270 *errmsg = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1271 *p = NULL;
63259 ac7eb6eaef68 Issue #8991: convertbuffer() rejects discontigious buffers Victor Stinner <victor.stinner@haypocalc.com> parents: 62484 diff changeset	1272 if (pb != NULL && pb->bf_releasebuffer != NULL) {
ac7eb6eaef68 Issue #8991: convertbuffer() rejects discontigious buffers Victor Stinner <victor.stinner@haypocalc.com> parents: 62484 diff changeset	1273 *errmsg = "read-only pinned buffer";
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1274 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1275 }
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42139 diff changeset	1276
63259 ac7eb6eaef68 Issue #8991: convertbuffer() rejects discontigious buffers Victor Stinner <victor.stinner@haypocalc.com> parents: 62484 diff changeset	1277 if (getbuffer(arg, &view, errmsg) < 0)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1278 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1279 count = view.len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1280 *p = view.buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1281 PyBuffer_Release(&view);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1282 return count;
17996 5a9debb14440 Internal refactoring of convertsimple() and friends. Jeremy Hylton <jeremy@alum.mit.edu> parents: 17857 diff changeset	1283 }
4026 6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1284
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48660 diff changeset	1285 static int
48848 5c75a33ef5b2 Merged revisions 66006 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 48683 diff changeset	1286 getbuffer(PyObject arg, Py_buffer view, char **errmsg)
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48660 diff changeset	1287 {
63259 ac7eb6eaef68 Issue #8991: convertbuffer() rejects discontigious buffers Victor Stinner <victor.stinner@haypocalc.com> parents: 62484 diff changeset	1288 if (PyObject_GetBuffer(arg, view, PyBUF_SIMPLE) != 0) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1289 *errmsg = "bytes or buffer";
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1290 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1291 }
62149 9d49b744078c Simplify getbuffer(): convertbuffer() fails anyway if bf_getbuffer is NULL Victor Stinner <victor.stinner@haypocalc.com> parents: 61972 diff changeset	1292 if (!PyBuffer_IsContiguous(view, 'C')) {
62482 bb6222a4ed24 getbuffer(): release the buffer on error (if the buffer is not contiguous) Victor Stinner <victor.stinner@haypocalc.com> parents: 62478 diff changeset	1293 PyBuffer_Release(view);
62149 9d49b744078c Simplify getbuffer(): convertbuffer() fails anyway if bf_getbuffer is NULL Victor Stinner <victor.stinner@haypocalc.com> parents: 61972 diff changeset	1294 *errmsg = "contiguous buffer";
9d49b744078c Simplify getbuffer(): convertbuffer() fails anyway if bf_getbuffer is NULL Victor Stinner <victor.stinner@haypocalc.com> parents: 61972 diff changeset	1295 return -1;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1296 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1297 return 0;
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48660 diff changeset	1298 }
cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48660 diff changeset	1299
4026 6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1300 /* 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	1301 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	1302
20711 2890769b1e69 PyArg_ParseTupleAndKeywords: return false on internal error, not -1 (I Tim Peters <tim.peters@gmail.com> parents: 20710 diff changeset	1303 /* 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	1304 int
acc7e3b4d042 Style conformance: function name begins a new line consistently. Fred Drake <fdrake@acm.org> parents: 20371 diff changeset	1305 PyArg_ParseTupleAndKeywords(PyObject *args,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1306 PyObject *keywords,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1307 const char *format,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1308 char **kwlist, ...)
4026 6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1309 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1310 int retval;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1311 va_list va;
20710 a44cc0c21cfe PyArg_ParseTupleAndKeywords: do basic sanity checks on the arguments, Tim Peters <tim.peters@gmail.com> parents: 20709 diff changeset	1312
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1313 if ((args == NULL \|\| !PyTuple_Check(args)) \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1314 (keywords != NULL && !PyDict_Check(keywords)) \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1315 format == NULL \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1316 kwlist == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1317 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1318 PyErr_BadInternalCall();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1319 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1320 }
20710 a44cc0c21cfe PyArg_ParseTupleAndKeywords: do basic sanity checks on the arguments, Tim Peters <tim.peters@gmail.com> parents: 20709 diff changeset	1321
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1322 va_start(va, kwlist);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1323 retval = vgetargskeywords(args, keywords, format, kwlist, &va, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1324 va_end(va);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1325 return retval;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1326 }
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1327
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1328 int
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1329 _PyArg_ParseTupleAndKeywords_SizeT(PyObject *args,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1330 PyObject *keywords,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1331 const char *format,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1332 char **kwlist, ...)
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1333 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1334 int retval;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1335 va_list va;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1336
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1337 if ((args == NULL \|\| !PyTuple_Check(args)) \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1338 (keywords != NULL && !PyDict_Check(keywords)) \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1339 format == NULL \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1340 kwlist == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1341 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1342 PyErr_BadInternalCall();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1343 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1344 }
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1345
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1346 va_start(va, kwlist);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1347 retval = vgetargskeywords(args, keywords, format,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1348 kwlist, &va, FLAG_SIZE_T);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1349 va_end(va);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1350 return retval;
4026 6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1351 }
6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1352
6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1353
32606 cc1f74d19fcb Add PyArg_VaParseTupleAndKeywords(). Document this function and Brett Cannon <bcannon@gmail.com> parents: 28952 diff changeset	1354 int
cc1f74d19fcb Add PyArg_VaParseTupleAndKeywords(). Document this function and Brett Cannon <bcannon@gmail.com> parents: 28952 diff changeset	1355 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	1356 PyObject *keywords,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	1357 const char *format,
36675 dba6494735d0 Revert backwards-incompatible const changes. Martin v. Löwis <martin@v.loewis.de> parents: 36625 diff changeset	1358 char **kwlist, va_list va)
32606 cc1f74d19fcb Add PyArg_VaParseTupleAndKeywords(). Document this function and Brett Cannon <bcannon@gmail.com> parents: 28952 diff changeset	1359 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1360 int retval;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1361 va_list lva;
32606 cc1f74d19fcb Add PyArg_VaParseTupleAndKeywords(). Document this function and Brett Cannon <bcannon@gmail.com> parents: 28952 diff changeset	1362
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1363 if ((args == NULL \|\| !PyTuple_Check(args)) \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1364 (keywords != NULL && !PyDict_Check(keywords)) \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1365 format == NULL \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1366 kwlist == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1367 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1368 PyErr_BadInternalCall();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1369 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1370 }
32606 cc1f74d19fcb Add PyArg_VaParseTupleAndKeywords(). Document this function and Brett Cannon <bcannon@gmail.com> parents: 28952 diff changeset	1371
63924 9108e7dcd7d8 Issue #2443: Added a new macro, Py_VA_COPY, which is equivalent to C99 Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 63259 diff changeset	1372 Py_VA_COPY(lva, va);
32606 cc1f74d19fcb Add PyArg_VaParseTupleAndKeywords(). Document this function and Brett Cannon <bcannon@gmail.com> parents: 28952 diff changeset	1373
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1374 retval = vgetargskeywords(args, keywords, format, kwlist, &lva, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1375 return retval;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1376 }
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1377
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1378 int
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1379 _PyArg_VaParseTupleAndKeywords_SizeT(PyObject *args,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1380 PyObject *keywords,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1381 const char *format,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1382 char **kwlist, va_list va)
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1383 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1384 int retval;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1385 va_list lva;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1386
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1387 if ((args == NULL \|\| !PyTuple_Check(args)) \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1388 (keywords != NULL && !PyDict_Check(keywords)) \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1389 format == NULL \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1390 kwlist == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1391 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1392 PyErr_BadInternalCall();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1393 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1394 }
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1395
63924 9108e7dcd7d8 Issue #2443: Added a new macro, Py_VA_COPY, which is equivalent to C99 Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 63259 diff changeset	1396 Py_VA_COPY(lva, va);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1397
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1398 retval = vgetargskeywords(args, keywords, format,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1399 kwlist, &lva, FLAG_SIZE_T);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1400 return retval;
32606 cc1f74d19fcb Add PyArg_VaParseTupleAndKeywords(). Document this function and Brett Cannon <bcannon@gmail.com> parents: 28952 diff changeset	1401 }
cc1f74d19fcb Add PyArg_VaParseTupleAndKeywords(). Document this function and Brett Cannon <bcannon@gmail.com> parents: 28952 diff changeset	1402
60931 79128efe8a99 prevent the dict constructor from accepting non-string keyword args #8419 Benjamin Peterson <benjamin@python.org> parents: 60399 diff changeset	1403 int
79128efe8a99 prevent the dict constructor from accepting non-string keyword args #8419 Benjamin Peterson <benjamin@python.org> parents: 60399 diff changeset	1404 PyArg_ValidateKeywordArguments(PyObject *kwargs)
79128efe8a99 prevent the dict constructor from accepting non-string keyword args #8419 Benjamin Peterson <benjamin@python.org> parents: 60399 diff changeset	1405 {
66220 379029714e24 handle dict subclasses gracefully in PyArg_ValidateKeywordArguments Benjamin Peterson <benjamin@python.org> parents: 63924 diff changeset	1406 if (!PyDict_Check(kwargs)) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60931 diff changeset	1407 PyErr_BadInternalCall();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60931 diff changeset	1408 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60931 diff changeset	1409 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60931 diff changeset	1410 if (!_PyDict_HasOnlyStringKeys(kwargs)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60931 diff changeset	1411 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60931 diff changeset	1412 "keyword arguments must be strings");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60931 diff changeset	1413 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60931 diff changeset	1414 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60931 diff changeset	1415 return 1;
60931 79128efe8a99 prevent the dict constructor from accepting non-string keyword args #8419 Benjamin Peterson <benjamin@python.org> parents: 60399 diff changeset	1416 }
79128efe8a99 prevent the dict constructor from accepting non-string keyword args #8419 Benjamin Peterson <benjamin@python.org> parents: 60399 diff changeset	1417
45548 8c3c5b4eef55 Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61081-61095 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45534 diff changeset	1418 #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	1419
4026 6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1420 static int
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35552 diff changeset	1421 vgetargskeywords(PyObject args, PyObject keywords, const char *format,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1422 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	1423 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1424 char msgbuf[512];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1425 int levels[32];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1426 const char fname, msg, custom_msg, keyword;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1427 int min = INT_MAX;
75842 052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1428 int max = INT_MAX;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1429 int i, len, nargs, nkeywords;
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	1430 PyObject *current_arg;
82233 4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	1431 freelistentry_t static_entries[STATIC_FREELIST_ENTRIES];
4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	1432 freelist_t freelist = {static_entries, 0, 0};
20708 e912b683ed3e vgetargskeywords(): remove test that can't succeed. Not a bugfix, just Tim Peters <tim.peters@gmail.com> parents: 20632 diff changeset	1433
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1434 assert(args != NULL && PyTuple_Check(args));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1435 assert(keywords == NULL \|\| PyDict_Check(keywords));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1436 assert(format != NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1437 assert(kwlist != NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1438 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	1439
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1440 /* grab the function name or custom error msg first (mutually exclusive) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1441 fname = strchr(format, ':');
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1442 if (fname) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1443 fname++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1444 custom_msg = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1445 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1446 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1447 custom_msg = strchr(format,';');
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1448 if (custom_msg)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1449 custom_msg++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1450 }
45548 8c3c5b4eef55 Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61081-61095 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45534 diff changeset	1451
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1452 /* scan kwlist and get greatest possible nbr of args */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1453 for (len=0; kwlist[len]; len++)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1454 continue;
20711 2890769b1e69 PyArg_ParseTupleAndKeywords: return false on internal error, not -1 (I Tim Peters <tim.peters@gmail.com> parents: 20710 diff changeset	1455
82233 4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	1456 if (len > STATIC_FREELIST_ENTRIES) {
4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	1457 freelist.entries = PyMem_NEW(freelistentry_t, len);
4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	1458 if (freelist.entries == NULL) {
4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	1459 PyErr_NoMemory();
4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	1460 return 0;
4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	1461 }
4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	1462 freelist.entries_malloced = 1;
75746 2b8994c2851a check result of PyMem_New Benjamin Peterson <benjamin@python.org> parents: 75733 diff changeset	1463 }
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	1464
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1465 nargs = PyTuple_GET_SIZE(args);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1466 nkeywords = (keywords == NULL) ? 0 : PyDict_Size(keywords);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1467 if (nargs + nkeywords > len) {
68809 4c2135930882 Issue #10833: Use PyErr_Format() and PyUnicode_FromFormat() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68796 diff changeset	1468 PyErr_Format(PyExc_TypeError,
4c2135930882 Issue #10833: Use PyErr_Format() and PyUnicode_FromFormat() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68796 diff changeset	1469 "%s%s takes at most %d argument%s (%d given)",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1470 (fname == NULL) ? "function" : fname,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1471 (fname == NULL) ? "" : "()",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1472 len,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1473 (len == 1) ? "" : "s",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1474 nargs + nkeywords);
75750 d08f0f3ab23e plug memory leak (closes #14325) Benjamin Peterson <benjamin@python.org> parents: 75748 diff changeset	1475 return cleanreturn(0, &freelist);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1476 }
20723 6ac45244c41e vgetargskeywords() Tim Peters <tim.peters@gmail.com> parents: 20722 diff changeset	1477
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1478 /* convert tuple args and keyword args in same loop, using kwlist to drive process */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1479 for (i = 0; i < len; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1480 keyword = kwlist[i];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1481 if (*format == '\|') {
75842 052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1482 if (min != INT_MAX) {
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1483 PyErr_SetString(PyExc_RuntimeError,
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1484 "Invalid format string (\| specified twice)");
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1485 return cleanreturn(0, &freelist);
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1486 }
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1487
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1488 min = i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1489 format++;
75842 052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1490
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1491 if (max != INT_MAX) {
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1492 PyErr_SetString(PyExc_RuntimeError,
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1493 "Invalid format string ($ before \|)");
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1494 return cleanreturn(0, &freelist);
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1495 }
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1496 }
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1497 if (*format == '$') {
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1498 if (max != INT_MAX) {
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1499 PyErr_SetString(PyExc_RuntimeError,
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1500 "Invalid format string ($ specified twice)");
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1501 return cleanreturn(0, &freelist);
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1502 }
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1503
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1504 max = i;
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1505 format++;
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1506
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1507 if (max < nargs) {
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1508 PyErr_Format(PyExc_TypeError,
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1509 "Function takes %s %d positional arguments"
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1510 " (%d given)",
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1511 (min != INT_MAX) ? "at most" : "exactly",
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1512 max, nargs);
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1513 return cleanreturn(0, &freelist);
052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1514 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1515 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1516 if (IS_END_OF_FORMAT(*format)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1517 PyErr_Format(PyExc_RuntimeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1518 "More keyword list entries (%d) than "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1519 "format specifiers (%d)", len, i);
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	1520 return cleanreturn(0, &freelist);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1521 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1522 current_arg = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1523 if (nkeywords) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1524 current_arg = PyDict_GetItemString(keywords, keyword);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1525 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1526 if (current_arg) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1527 --nkeywords;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1528 if (i < nargs) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1529 /* arg present in tuple and in dict */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1530 PyErr_Format(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1531 "Argument given by name ('%s') "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1532 "and position (%d)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1533 keyword, i+1);
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	1534 return cleanreturn(0, &freelist);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1535 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1536 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1537 else if (nkeywords && PyErr_Occurred())
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	1538 return cleanreturn(0, &freelist);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1539 else if (i < nargs)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1540 current_arg = PyTuple_GET_ITEM(args, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1541
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1542 if (current_arg) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1543 msg = convertitem(current_arg, &format, p_va, flags,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1544 levels, msgbuf, sizeof(msgbuf), &freelist);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1545 if (msg) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1546 seterror(i+1, msg, levels, fname, custom_msg);
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	1547 return cleanreturn(0, &freelist);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1548 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1549 continue;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1550 }
45548 8c3c5b4eef55 Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61081-61095 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45534 diff changeset	1551
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1552 if (i < min) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1553 PyErr_Format(PyExc_TypeError, "Required argument "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1554 "'%s' (pos %d) not found",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1555 keyword, i+1);
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	1556 return cleanreturn(0, &freelist);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1557 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1558 /* current code reports success when all required args
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1559 * fulfilled and no keyword args left, with no further
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1560 * validation. XXX Maybe skip this in debug build ?
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1561 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1562 if (!nkeywords)
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	1563 return cleanreturn(1, &freelist);
45548 8c3c5b4eef55 Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61081-61095 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45534 diff changeset	1564
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1565 /* We are into optional args, skip thru to any remaining
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1566 * keyword args */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1567 msg = skipitem(&format, p_va, flags);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1568 if (msg) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1569 PyErr_Format(PyExc_RuntimeError, "%s: '%s'", msg,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1570 format);
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	1571 return cleanreturn(0, &freelist);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1572 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1573 }
4026 6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1574
75842 052779d34945 Issue #14328: Add keyword-only parameters to PyArg_ParseTupleAndKeywords. Larry Hastings <larry@hastings.org> parents: 75750 diff changeset	1575 if (!IS_END_OF_FORMAT(format) && (format != '\|') && (*format != '$')) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1576 PyErr_Format(PyExc_RuntimeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1577 "more argument specifiers than keyword list entries "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1578 "(remaining format:'%s')", format);
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	1579 return cleanreturn(0, &freelist);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1580 }
20715 5e6f8187bd48 vgetargskeywords: Tim Peters <tim.peters@gmail.com> parents: 20714 diff changeset	1581
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1582 /* make sure there are no extraneous keyword arguments */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1583 if (nkeywords > 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1584 PyObject key, value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1585 Py_ssize_t pos = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1586 while (PyDict_Next(keywords, &pos, &key, &value)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1587 int match = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1588 if (!PyUnicode_Check(key)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1589 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1590 "keywords must be strings");
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	1591 return cleanreturn(0, &freelist);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1592 }
61717 1504cc5a15a1 Issue #6697: Fix a crash if a keyword contains a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1593 /* check that _PyUnicode_AsString() result is not NULL */
82233 4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	1594 for (i = 0; i < len; i++) {
4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	1595 if (!PyUnicode_CompareWithASCIIString(key, kwlist[i])) {
4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	1596 match = 1;
4e985a96a612 Issue #17170: speed up PyArg_ParseTuple[AndKeywords] a bit. Antoine Pitrou <solipsis@pitrou.net> parents: 82111 diff changeset	1597 break;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1598 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1599 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1600 if (!match) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1601 PyErr_Format(PyExc_TypeError,
61717 1504cc5a15a1 Issue #6697: Fix a crash if a keyword contains a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1602 "'%U' is an invalid keyword "
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1603 "argument for this function",
61717 1504cc5a15a1 Issue #6697: Fix a crash if a keyword contains a surrogate Victor Stinner <victor.stinner@haypocalc.com> parents: 61466 diff changeset	1604 key);
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	1605 return cleanreturn(0, &freelist);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1606 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1607 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1608 }
20723 6ac45244c41e vgetargskeywords() Tim Peters <tim.peters@gmail.com> parents: 20722 diff changeset	1609
75733 9fc456ac20cf Issue #14325: Stop using python lists, capsules, and the garbage collector to deal with PyArg_Parse* cleanup. Jean-Paul Calderone <exarkun@twistedmatrix.com> parents: 72915 diff changeset	1610 return cleanreturn(1, &freelist);
4026 6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1611 }
6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1612
6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1613
6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1614 static char *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1615 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	1616 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1617 const char format = p_format;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1618 char c = *format++;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	1619
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1620 switch (c) {
35552 9b7d117eb4bc Complete format code support in getargs.c::skipitem(), which is called when Georg Brandl <georg@python.org> parents: 35449 diff changeset	1621
76845 8ab37fa24e58 Issue #14746: Remove redundant paragraphs from skipitem() in Python/getargs.c. Larry Hastings <larry@hastings.org> parents: 76835 diff changeset	1622 /*
8ab37fa24e58 Issue #14746: Remove redundant paragraphs from skipitem() in Python/getargs.c. Larry Hastings <larry@hastings.org> parents: 76835 diff changeset	1623 * codes that take a single data pointer as an argument
8ab37fa24e58 Issue #14746: Remove redundant paragraphs from skipitem() in Python/getargs.c. Larry Hastings <larry@hastings.org> parents: 76835 diff changeset	1624 * (the type of the pointer is irrelevant)
8ab37fa24e58 Issue #14746: Remove redundant paragraphs from skipitem() in Python/getargs.c. Larry Hastings <larry@hastings.org> parents: 76835 diff changeset	1625 */
35552 9b7d117eb4bc Complete format code support in getargs.c::skipitem(), which is called when Georg Brandl <georg@python.org> parents: 35449 diff changeset	1626
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1627 case 'b': /* byte -- very short int */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1628 case 'B': /* byte as bitfield */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1629 case 'h': /* short int */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1630 case 'H': /* short int as bitfield */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1631 case 'i': /* int */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1632 case 'I': /* int sized bitfield */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1633 case 'l': /* long int */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1634 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	1635 #ifdef HAVE_LONG_LONG
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1636 case 'L': /* PY_LONG_LONG */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1637 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	1638 #endif
76845 8ab37fa24e58 Issue #14746: Remove redundant paragraphs from skipitem() in Python/getargs.c. Larry Hastings <larry@hastings.org> parents: 76835 diff changeset	1639 case 'n': /* Py_ssize_t */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1640 case 'f': /* float */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1641 case 'd': /* double */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1642 case 'D': /* complex double */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1643 case 'c': /* char */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1644 case 'C': /* unicode char */
76816 e4617650f006 Issue #14705: Added support for the new 'p' format unit to skipitem(). Larry Hastings <larry@hastings.org> parents: 76776 diff changeset	1645 case 'p': /* boolean predicate */
76845 8ab37fa24e58 Issue #14746: Remove redundant paragraphs from skipitem() in Python/getargs.c. Larry Hastings <larry@hastings.org> parents: 76835 diff changeset	1646 case 'S': /* string object */
8ab37fa24e58 Issue #14746: Remove redundant paragraphs from skipitem() in Python/getargs.c. Larry Hastings <larry@hastings.org> parents: 76835 diff changeset	1647 case 'Y': /* string object */
8ab37fa24e58 Issue #14746: Remove redundant paragraphs from skipitem() in Python/getargs.c. Larry Hastings <larry@hastings.org> parents: 76835 diff changeset	1648 case 'U': /* unicode string object */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1649 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1650 (void) va_arg(p_va, void );
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1651 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1652 }
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36345 diff changeset	1653
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1654 /* string codes */
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	1655
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1656 case 'e': /* string with encoding */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1657 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1658 (void) va_arg(p_va, const char );
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1659 if (!(format == 's' \|\| format == 't'))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1660 /* after 'e', only 's' and 't' is allowed */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1661 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1662 format++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1663 /* explicit fallthrough to string cases */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1664 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	1665
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1666 case 's': /* string */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1667 case 'z': /* string or None */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1668 case 'y': /* bytes */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1669 case 'u': /* unicode string */
76834 91612618985b Issue #14749: Add support for 'Z' to skipitem() in Python/getargs.c. Larry Hastings <larry@hastings.org> parents: 68795 diff changeset	1670 case 'Z': /* unicode string or None */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1671 case 'w': /* buffer, read-write */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1672 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1673 (void) va_arg(p_va, char *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1674 if (*format == '#') {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1675 if (flags & FLAG_SIZE_T)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1676 (void) va_arg(p_va, Py_ssize_t );
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1677 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1678 (void) va_arg(p_va, int );
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1679 format++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1680 } else if ((c == 's' \|\| c == 'z' \|\| c == 'y') && format == '') {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1681 format++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1682 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1683 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1684 }
35552 9b7d117eb4bc Complete format code support in getargs.c::skipitem(), which is called when Georg Brandl <georg@python.org> parents: 35449 diff changeset	1685
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1686 case 'O': /* object */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1687 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1688 if (*format == '!') {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1689 format++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1690 (void) va_arg(p_va, PyTypeObject);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1691 (void) va_arg(p_va, PyObject *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1692 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1693 else if (*format == '&') {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1694 typedef int (converter)(PyObject , void *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1695 (void) va_arg(*p_va, converter);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1696 (void) va_arg(p_va, void );
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1697 format++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1698 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1699 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1700 (void) va_arg(p_va, PyObject *);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1701 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1702 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1703 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	1704
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1705 case '(': /* bypass tuple, not handled at all previously */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1706 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1707 char *msg;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1708 for (;;) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1709 if (*format==')')
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1710 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1711 if (IS_END_OF_FORMAT(*format))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1712 return "Unmatched left paren in format "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1713 "string";
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1714 msg = skipitem(&format, p_va, flags);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1715 if (msg)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1716 return msg;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1717 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1718 format++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1719 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1720 }
45548 8c3c5b4eef55 Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61081-61095 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45534 diff changeset	1721
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1722 case ')':
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1723 return "Unmatched right paren in format string";
45548 8c3c5b4eef55 Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61081-61095 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45534 diff changeset	1724
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1725 default:
35552 9b7d117eb4bc Complete format code support in getargs.c::skipitem(), which is called when Georg Brandl <georg@python.org> parents: 35449 diff changeset	1726 err:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1727 return "impossible<bad format char>";
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	1728
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1729 }
35552 9b7d117eb4bc Complete format code support in getargs.c::skipitem(), which is called when Georg Brandl <georg@python.org> parents: 35449 diff changeset	1730
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1731 *p_format = format;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1732 return NULL;
4026 6bbc13b7dca8 Support for keyword arguments (PyArg_ParseTupleAndKeywords) donated by Guido van Rossum <guido@python.org> parents: 3766 diff changeset	1733 }
20632 6c84d55abb58 PyArg_UnpackTuple(): New argument unpacking function suggested by Jim Fred Drake <fdrake@acm.org> parents: 20629 diff changeset	1734
6c84d55abb58 PyArg_UnpackTuple(): New argument unpacking function suggested by Jim Fred Drake <fdrake@acm.org> parents: 20629 diff changeset	1735
6c84d55abb58 PyArg_UnpackTuple(): New argument unpacking function suggested by Jim Fred Drake <fdrake@acm.org> parents: 20629 diff changeset	1736 int
36750 92ba72484ff3 Use Py_ssize_t for PyArg_UnpackTuple arguments. Martin v. Löwis <martin@v.loewis.de> parents: 36675 diff changeset	1737 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	1738 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1739 Py_ssize_t i, l;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1740 PyObject **o;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1741 va_list vargs;
20632 6c84d55abb58 PyArg_UnpackTuple(): New argument unpacking function suggested by Jim Fred Drake <fdrake@acm.org> parents: 20629 diff changeset	1742
6c84d55abb58 PyArg_UnpackTuple(): New argument unpacking function suggested by Jim Fred Drake <fdrake@acm.org> parents: 20629 diff changeset	1743 #ifdef HAVE_STDARG_PROTOTYPES
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1744 va_start(vargs, max);
20632 6c84d55abb58 PyArg_UnpackTuple(): New argument unpacking function suggested by Jim Fred Drake <fdrake@acm.org> parents: 20629 diff changeset	1745 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1746 va_start(vargs);
20632 6c84d55abb58 PyArg_UnpackTuple(): New argument unpacking function suggested by Jim Fred Drake <fdrake@acm.org> parents: 20629 diff changeset	1747 #endif
6c84d55abb58 PyArg_UnpackTuple(): New argument unpacking function suggested by Jim Fred Drake <fdrake@acm.org> parents: 20629 diff changeset	1748
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1749 assert(min >= 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1750 assert(min <= max);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1751 if (!PyTuple_Check(args)) {
78949 71e854617297 Added missing va_end in error branch of PyArg_UnpackTuple(). CID 486641 Christian Heimes <christian@cheimes.de> parents: 76834 diff changeset	1752 va_end(vargs);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1753 PyErr_SetString(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1754 "PyArg_UnpackTuple() argument list is not a tuple");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1755 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1756 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1757 l = PyTuple_GET_SIZE(args);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1758 if (l < min) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1759 if (name != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1760 PyErr_Format(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1761 PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1762 "%s expected %s%zd arguments, got %zd",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1763 name, (min == max ? "" : "at least "), min, l);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1764 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1765 PyErr_Format(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1766 PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1767 "unpacked tuple should have %s%zd elements,"
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1768 " but has %zd",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1769 (min == max ? "" : "at least "), min, l);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1770 va_end(vargs);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1771 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1772 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1773 if (l > max) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1774 if (name != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1775 PyErr_Format(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1776 PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1777 "%s expected %s%zd arguments, got %zd",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1778 name, (min == max ? "" : "at most "), max, l);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1779 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1780 PyErr_Format(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1781 PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1782 "unpacked tuple should have %s%zd elements,"
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1783 " but has %zd",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1784 (min == max ? "" : "at most "), max, l);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1785 va_end(vargs);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1786 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1787 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1788 for (i = 0; i < l; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1789 o = va_arg(vargs, PyObject **);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1790 *o = PyTuple_GET_ITEM(args, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1791 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1792 va_end(vargs);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1793 return 1;
20632 6c84d55abb58 PyArg_UnpackTuple(): New argument unpacking function suggested by Jim Fred Drake <fdrake@acm.org> parents: 20629 diff changeset	1794 }
35449 1fdfd0130e28 Disallow keyword arguments for type constructors that don't use them. Georg Brandl <georg@python.org> parents: 34846 diff changeset	1795
1fdfd0130e28 Disallow keyword arguments for type constructors that don't use them. Georg Brandl <georg@python.org> parents: 34846 diff changeset	1796
1fdfd0130e28 Disallow keyword arguments for type constructors that don't use them. Georg Brandl <georg@python.org> parents: 34846 diff changeset	1797 /* 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	1798 *
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	1799 * Sets a TypeError and returns 0 if the kwds dict is
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1800 * 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	1801 */
1fdfd0130e28 Disallow keyword arguments for type constructors that don't use them. Georg Brandl <georg@python.org> parents: 34846 diff changeset	1802 int
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35552 diff changeset	1803 _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	1804 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1805 if (kw == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1806 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1807 if (!PyDict_CheckExact(kw)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1808 PyErr_BadInternalCall();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1809 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1810 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1811 if (PyDict_Size(kw) == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1812 return 1;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43651 diff changeset	1813
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1814 PyErr_Format(PyExc_TypeError, "%s does not take keyword arguments",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1815 funcname);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57549 diff changeset	1816 return 0;
35449 1fdfd0130e28 Disallow keyword arguments for type constructors that don't use them. Georg Brandl <georg@python.org> parents: 34846 diff changeset	1817 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	1818 #ifdef __cplusplus
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	1819 };
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	1820 #endif

Mercurial > cpython-lru_cache-weakref

annotate Python/getargs.c @ 84172:e353f64dfd95