cpython-lru_cache-weakref: Objects/bytesobject.c annotate

annotate Objects/bytesobject.c @ 46567:ffeecbebf3ca

Block 2.6-only doc change.

author	Georg Brandl <georg@python.org>
date	Sat, 26 Apr 2008 18:28:08 +0000
parents	ad170a335967
children	44954d65a73a

rev	line source
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	1 /* PyBytes (bytearray) implementation */
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	2
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	3 #define PY_SSIZE_T_CLEAN
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	4 #include "Python.h"
38115 a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	5 #include "structmember.h"
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	6 #include "bytes_methods.h"
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	7
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	8 static PyBytesObject *nullbytes = NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	9
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	10 void
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	11 PyBytes_Fini(void)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	12 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	13 Py_CLEAR(nullbytes);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	14 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	15
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	16 int
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	17 PyBytes_Init(void)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	18 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	19 nullbytes = PyObject_New(PyBytesObject, &PyBytes_Type);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	20 if (nullbytes == NULL)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	21 return 0;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	22 nullbytes->ob_bytes = NULL;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	23 Py_SIZE(nullbytes) = nullbytes->ob_alloc = 0;
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: 42499 diff changeset	24 nullbytes->ob_exports = 0;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	25 return 1;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	26 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	27
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	28 /* end nullbytes support */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	29
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	30 /* Helpers */
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	31
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	32 static int
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	33 _getbytevalue(PyObject* arg, int *value)
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	34 {
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	35 long face_value;
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	36
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43947 diff changeset	37 if (PyLong_Check(arg)) {
f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43947 diff changeset	38 face_value = PyLong_AsLong(arg);
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	39 if (face_value < 0 \|\| face_value >= 256) {
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	40 PyErr_SetString(PyExc_ValueError, "byte must be in range(0, 256)");
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	41 return 0;
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	42 }
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	43 } else {
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	44 PyErr_Format(PyExc_TypeError, "an integer is required");
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	45 return 0;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	46 }
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	47
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	48 *value = face_value;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	49 return 1;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	50 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	51
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: 42499 diff changeset	52 static int
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43321 diff changeset	53 bytes_getbuffer(PyBytesObject obj, Py_buffer view, int flags)
42779 4b7036dc76d5 Whitespace cleanup. Guido van Rossum <guido@python.org> parents: 42669 diff changeset	54 {
46447 ad170a335967 Re-indented bytes_getbuffer() and bytes_releasebuffer() to 4-space Alexandre Vassalotti <alexandre@peadrop.com> parents: 46446 diff changeset	55 int ret;
ad170a335967 Re-indented bytes_getbuffer() and bytes_releasebuffer() to 4-space Alexandre Vassalotti <alexandre@peadrop.com> parents: 46446 diff changeset	56 void *ptr;
ad170a335967 Re-indented bytes_getbuffer() and bytes_releasebuffer() to 4-space Alexandre Vassalotti <alexandre@peadrop.com> parents: 46446 diff changeset	57 if (view == NULL) {
ad170a335967 Re-indented bytes_getbuffer() and bytes_releasebuffer() to 4-space Alexandre Vassalotti <alexandre@peadrop.com> parents: 46446 diff changeset	58 obj->ob_exports++;
ad170a335967 Re-indented bytes_getbuffer() and bytes_releasebuffer() to 4-space Alexandre Vassalotti <alexandre@peadrop.com> parents: 46446 diff changeset	59 return 0;
ad170a335967 Re-indented bytes_getbuffer() and bytes_releasebuffer() to 4-space Alexandre Vassalotti <alexandre@peadrop.com> parents: 46446 diff changeset	60 }
ad170a335967 Re-indented bytes_getbuffer() and bytes_releasebuffer() to 4-space Alexandre Vassalotti <alexandre@peadrop.com> parents: 46446 diff changeset	61 if (obj->ob_bytes == NULL)
ad170a335967 Re-indented bytes_getbuffer() and bytes_releasebuffer() to 4-space Alexandre Vassalotti <alexandre@peadrop.com> parents: 46446 diff changeset	62 ptr = "";
ad170a335967 Re-indented bytes_getbuffer() and bytes_releasebuffer() to 4-space Alexandre Vassalotti <alexandre@peadrop.com> parents: 46446 diff changeset	63 else
ad170a335967 Re-indented bytes_getbuffer() and bytes_releasebuffer() to 4-space Alexandre Vassalotti <alexandre@peadrop.com> parents: 46446 diff changeset	64 ptr = obj->ob_bytes;
ad170a335967 Re-indented bytes_getbuffer() and bytes_releasebuffer() to 4-space Alexandre Vassalotti <alexandre@peadrop.com> parents: 46446 diff changeset	65 ret = PyBuffer_FillInfo(view, ptr, Py_SIZE(obj), 0, flags);
ad170a335967 Re-indented bytes_getbuffer() and bytes_releasebuffer() to 4-space Alexandre Vassalotti <alexandre@peadrop.com> parents: 46446 diff changeset	66 if (ret >= 0) {
ad170a335967 Re-indented bytes_getbuffer() and bytes_releasebuffer() to 4-space Alexandre Vassalotti <alexandre@peadrop.com> parents: 46446 diff changeset	67 obj->ob_exports++;
ad170a335967 Re-indented bytes_getbuffer() and bytes_releasebuffer() to 4-space Alexandre Vassalotti <alexandre@peadrop.com> parents: 46446 diff changeset	68 }
ad170a335967 Re-indented bytes_getbuffer() and bytes_releasebuffer() to 4-space Alexandre Vassalotti <alexandre@peadrop.com> parents: 46446 diff changeset	69 return ret;
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: 42499 diff changeset	70 }
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: 42499 diff changeset	71
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: 42499 diff changeset	72 static void
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43321 diff changeset	73 bytes_releasebuffer(PyBytesObject obj, 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: 42499 diff changeset	74 {
46447 ad170a335967 Re-indented bytes_getbuffer() and bytes_releasebuffer() to 4-space Alexandre Vassalotti <alexandre@peadrop.com> parents: 46446 diff changeset	75 obj->ob_exports--;
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: 42499 diff changeset	76 }
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: 42499 diff changeset	77
42893 2c02ba72714b Make some internal functions static Neal Norwitz <nnorwitz@gmail.com> parents: 42779 diff changeset	78 static Py_ssize_t
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43321 diff changeset	79 _getbuffer(PyObject obj, Py_buffer view)
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	80 {
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	81 PyBufferProcs *buffer = Py_TYPE(obj)->tp_as_buffer;
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	82
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	83 if (buffer == NULL \|\| buffer->bf_getbuffer == NULL)
42975 71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	84 {
71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	85 PyErr_Format(PyExc_TypeError,
71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	86 "Type %.100s doesn't support the buffer API",
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	87 Py_TYPE(obj)->tp_name);
42975 71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	88 return -1;
71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	89 }
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: 42499 diff changeset	90
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: 42499 diff changeset	91 if (buffer->bf_getbuffer(obj, view, PyBUF_SIMPLE) < 0)
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: 42499 diff changeset	92 return -1;
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: 42499 diff changeset	93 return view->len;
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	94 }
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	95
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	96 /* Direct API functions */
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	97
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	98 PyObject *
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	99 PyBytes_FromObject(PyObject *input)
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	100 {
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	101 return PyObject_CallFunctionObjArgs((PyObject *)&PyBytes_Type,
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	102 input, NULL);
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	103 }
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	104
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	105 PyObject *
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	106 PyBytes_FromStringAndSize(const char *bytes, Py_ssize_t size)
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	107 {
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	108 PyBytesObject *new;
43687 6ab64f6b4c03 Fix some Py_ssize_t warnings on Win64 that were probably bugs Neal Norwitz <nnorwitz@gmail.com> parents: 43632 diff changeset	109 Py_ssize_t alloc;
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	110
46430 47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46145 diff changeset	111 if (size < 0) {
47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46145 diff changeset	112 PyErr_SetString(PyExc_SystemError,
47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46145 diff changeset	113 "Negative size passed to PyBytes_FromStringAndSize");
47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46145 diff changeset	114 return NULL;
47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46145 diff changeset	115 }
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	116
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	117 new = PyObject_New(PyBytesObject, &PyBytes_Type);
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	118 if (new == NULL)
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	119 return NULL;
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	120
41595 2c54763c4504 More coding by random modification. Guido van Rossum <guido@python.org> parents: 41450 diff changeset	121 if (size == 0) {
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	122 new->ob_bytes = NULL;
41595 2c54763c4504 More coding by random modification. Guido van Rossum <guido@python.org> parents: 41450 diff changeset	123 alloc = 0;
2c54763c4504 More coding by random modification. Guido van Rossum <guido@python.org> parents: 41450 diff changeset	124 }
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	125 else {
41595 2c54763c4504 More coding by random modification. Guido van Rossum <guido@python.org> parents: 41450 diff changeset	126 alloc = size + 1;
2c54763c4504 More coding by random modification. Guido van Rossum <guido@python.org> parents: 41450 diff changeset	127 new->ob_bytes = PyMem_Malloc(alloc);
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	128 if (new->ob_bytes == NULL) {
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	129 Py_DECREF(new);
43031 ac2d5d346252 Try to fix the problem on the Windows buildbot where this code: Neal Norwitz <nnorwitz@gmail.com> parents: 43001 diff changeset	130 return PyErr_NoMemory();
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	131 }
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	132 if (bytes != NULL)
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	133 memcpy(new->ob_bytes, bytes, size);
41595 2c54763c4504 More coding by random modification. Guido van Rossum <guido@python.org> parents: 41450 diff changeset	134 new->ob_bytes[size] = '\0'; /* Trailing null byte */
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	135 }
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	136 Py_SIZE(new) = size;
41595 2c54763c4504 More coding by random modification. Guido van Rossum <guido@python.org> parents: 41450 diff changeset	137 new->ob_alloc = alloc;
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: 42499 diff changeset	138 new->ob_exports = 0;
41448 458c8db2e946 Clean up trailing whitespace. Guido van Rossum <guido@python.org> parents: 41426 diff changeset	139
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	140 return (PyObject *)new;
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	141 }
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	142
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	143 Py_ssize_t
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	144 PyBytes_Size(PyObject *self)
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	145 {
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	146 assert(self != NULL);
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	147 assert(PyBytes_Check(self));
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	148
38117 57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	149 return PyBytes_GET_SIZE(self);
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	150 }
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	151
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	152 char *
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	153 PyBytes_AsString(PyObject *self)
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	154 {
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	155 assert(self != NULL);
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	156 assert(PyBytes_Check(self));
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	157
38117 57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	158 return PyBytes_AS_STRING(self);
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	159 }
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	160
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	161 int
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	162 PyBytes_Resize(PyObject *self, Py_ssize_t size)
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	163 {
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	164 void *sval;
38115 a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	165 Py_ssize_t alloc = ((PyBytesObject *)self)->ob_alloc;
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	166
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	167 assert(self != NULL);
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	168 assert(PyBytes_Check(self));
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	169 assert(size >= 0);
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	170
38115 a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	171 if (size < alloc / 2) {
a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	172 /* Major downsize; resize down to exact size */
41597 cb3c92062ec4 Add trailing null bytes to a few more places. Guido van Rossum <guido@python.org> parents: 41595 diff changeset	173 alloc = size + 1;
38115 a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	174 }
41595 2c54763c4504 More coding by random modification. Guido van Rossum <guido@python.org> parents: 41450 diff changeset	175 else if (size < alloc) {
38115 a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	176 /* Within allocated size; quick exit */
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	177 Py_SIZE(self) = size;
42975 71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	178 ((PyBytesObject )self)->ob_bytes[size] = '\0'; / Trailing null */
38115 a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	179 return 0;
a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	180 }
a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	181 else if (size <= alloc * 1.125) {
a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	182 /* Moderate upsize; overallocate similar to list_resize() */
a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	183 alloc = size + (size >> 3) + (size < 9 ? 3 : 6);
a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	184 }
a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	185 else {
a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	186 /* Major upsize; resize up to exact size */
41597 cb3c92062ec4 Add trailing null bytes to a few more places. Guido van Rossum <guido@python.org> parents: 41595 diff changeset	187 alloc = size + 1;
38115 a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	188 }
a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	189
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: 42499 diff changeset	190 if (((PyBytesObject *)self)->ob_exports > 0) {
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: 42499 diff changeset	191 /*
42975 71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	192 fprintf(stderr, "%d: %s", ((PyBytesObject *)self)->ob_exports,
71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	193 ((PyBytesObject *)self)->ob_bytes);
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: 42499 diff changeset	194 */
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: 42499 diff changeset	195 PyErr_SetString(PyExc_BufferError,
42975 71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	196 "Existing exports of data: object cannot be re-sized");
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: 42499 diff changeset	197 return -1;
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: 42499 diff changeset	198 }
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: 42499 diff changeset	199
38115 a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	200 sval = PyMem_Realloc(((PyBytesObject *)self)->ob_bytes, alloc);
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	201 if (sval == NULL) {
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	202 PyErr_NoMemory();
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	203 return -1;
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	204 }
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	205
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	206 ((PyBytesObject *)self)->ob_bytes = sval;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	207 Py_SIZE(self) = size;
38115 a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	208 ((PyBytesObject *)self)->ob_alloc = alloc;
41595 2c54763c4504 More coding by random modification. Guido van Rossum <guido@python.org> parents: 41450 diff changeset	209 ((PyBytesObject )self)->ob_bytes[size] = '\0'; / Trailing null byte */
2c54763c4504 More coding by random modification. Guido van Rossum <guido@python.org> parents: 41450 diff changeset	210
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	211 return 0;
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	212 }
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	213
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	214 PyObject *
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	215 PyBytes_Concat(PyObject a, PyObject b)
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	216 {
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: 42499 diff changeset	217 Py_ssize_t size;
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43321 diff changeset	218 Py_buffer va, vb;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	219 PyBytesObject *result = NULL;
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	220
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: 42499 diff changeset	221 va.len = -1;
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: 42499 diff changeset	222 vb.len = -1;
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: 42499 diff changeset	223 if (_getbuffer(a, &va) < 0 \|\|
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: 42499 diff changeset	224 _getbuffer(b, &vb) < 0) {
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: 42499 diff changeset	225 PyErr_Format(PyExc_TypeError, "can't concat %.100s to %.100s",
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	226 Py_TYPE(a)->tp_name, Py_TYPE(b)->tp_name);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	227 goto done;
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	228 }
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	229
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: 42499 diff changeset	230 size = va.len + vb.len;
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: 42499 diff changeset	231 if (size < 0) {
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: 42499 diff changeset	232 return PyErr_NoMemory();
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	233 goto done;
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: 42499 diff changeset	234 }
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	235
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	236 result = (PyBytesObject *) PyBytes_FromStringAndSize(NULL, size);
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	237 if (result != NULL) {
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: 42499 diff changeset	238 memcpy(result->ob_bytes, va.buf, va.len);
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: 42499 diff changeset	239 memcpy(result->ob_bytes + va.len, vb.buf, vb.len);
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	240 }
42779 4b7036dc76d5 Whitespace cleanup. Guido van Rossum <guido@python.org> parents: 42669 diff changeset	241
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	242 done:
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	243 if (va.len != -1)
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	244 PyObject_ReleaseBuffer(a, &va);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	245 if (vb.len != -1)
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	246 PyObject_ReleaseBuffer(b, &vb);
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	247 return (PyObject *)result;
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	248 }
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	249
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	250 /* Functions stuffed into the type object */
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	251
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	252 static Py_ssize_t
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	253 bytes_length(PyBytesObject *self)
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	254 {
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	255 return Py_SIZE(self);
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	256 }
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	257
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	258 static PyObject *
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	259 bytes_iconcat(PyBytesObject self, PyObject other)
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	260 {
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	261 Py_ssize_t mysize;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	262 Py_ssize_t size;
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43321 diff changeset	263 Py_buffer vo;
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: 42499 diff changeset	264
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: 42499 diff changeset	265 if (_getbuffer(other, &vo) < 0) {
42975 71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	266 PyErr_Format(PyExc_TypeError, "can't concat bytes to %.100s",
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	267 Py_TYPE(self)->tp_name);
42975 71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	268 return NULL;
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	269 }
41448 458c8db2e946 Clean up trailing whitespace. Guido van Rossum <guido@python.org> parents: 41426 diff changeset	270
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	271 mysize = Py_SIZE(self);
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: 42499 diff changeset	272 size = mysize + vo.len;
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: 42499 diff changeset	273 if (size < 0) {
42975 71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	274 PyObject_ReleaseBuffer(other, &vo);
71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	275 return PyErr_NoMemory();
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: 42499 diff changeset	276 }
41597 cb3c92062ec4 Add trailing null bytes to a few more places. Guido van Rossum <guido@python.org> parents: 41595 diff changeset	277 if (size < self->ob_alloc) {
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	278 Py_SIZE(self) = size;
86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	279 self->ob_bytes[Py_SIZE(self)] = '\0'; /* Trailing null byte */
41597 cb3c92062ec4 Add trailing null bytes to a few more places. Guido van Rossum <guido@python.org> parents: 41595 diff changeset	280 }
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: 42499 diff changeset	281 else if (PyBytes_Resize((PyObject *)self, size) < 0) {
42975 71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	282 PyObject_ReleaseBuffer(other, &vo);
71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	283 return NULL;
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: 42499 diff changeset	284 }
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: 42499 diff changeset	285 memcpy(self->ob_bytes + mysize, vo.buf, vo.len);
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: 42499 diff changeset	286 PyObject_ReleaseBuffer(other, &vo);
38017 0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	287 Py_INCREF(self);
0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	288 return (PyObject *)self;
0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	289 }
0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	290
0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	291 static PyObject *
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	292 bytes_repeat(PyBytesObject *self, Py_ssize_t count)
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	293 {
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	294 PyBytesObject *result;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	295 Py_ssize_t mysize;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	296 Py_ssize_t size;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	297
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	298 if (count < 0)
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	299 count = 0;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	300 mysize = Py_SIZE(self);
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	301 size = mysize * count;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	302 if (count != 0 && size / count != mysize)
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	303 return PyErr_NoMemory();
41595 2c54763c4504 More coding by random modification. Guido van Rossum <guido@python.org> parents: 41450 diff changeset	304 result = (PyBytesObject *)PyBytes_FromStringAndSize(NULL, size);
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	305 if (result != NULL && size != 0) {
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	306 if (mysize == 1)
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	307 memset(result->ob_bytes, self->ob_bytes[0], size);
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	308 else {
38017 0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	309 Py_ssize_t i;
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	310 for (i = 0; i < count; i++)
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	311 memcpy(result->ob_bytes + i*mysize, self->ob_bytes, mysize);
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	312 }
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	313 }
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	314 return (PyObject *)result;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	315 }
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	316
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	317 static PyObject *
38017 0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	318 bytes_irepeat(PyBytesObject *self, Py_ssize_t count)
0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	319 {
0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	320 Py_ssize_t mysize;
0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	321 Py_ssize_t size;
0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	322
0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	323 if (count < 0)
0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	324 count = 0;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	325 mysize = Py_SIZE(self);
38017 0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	326 size = mysize * count;
0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	327 if (count != 0 && size / count != mysize)
0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	328 return PyErr_NoMemory();
41597 cb3c92062ec4 Add trailing null bytes to a few more places. Guido van Rossum <guido@python.org> parents: 41595 diff changeset	329 if (size < self->ob_alloc) {
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	330 Py_SIZE(self) = size;
86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	331 self->ob_bytes[Py_SIZE(self)] = '\0'; /* Trailing null byte */
41597 cb3c92062ec4 Add trailing null bytes to a few more places. Guido van Rossum <guido@python.org> parents: 41595 diff changeset	332 }
38115 a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	333 else if (PyBytes_Resize((PyObject *)self, size) < 0)
38017 0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	334 return NULL;
41448 458c8db2e946 Clean up trailing whitespace. Guido van Rossum <guido@python.org> parents: 41426 diff changeset	335
38017 0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	336 if (mysize == 1)
0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	337 memset(self->ob_bytes, self->ob_bytes[0], size);
0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	338 else {
0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	339 Py_ssize_t i;
0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	340 for (i = 1; i < count; i++)
0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	341 memcpy(self->ob_bytes + i*mysize, self->ob_bytes, mysize);
0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	342 }
0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	343
0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	344 Py_INCREF(self);
0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	345 return (PyObject *)self;
0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	346 }
0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	347
0b8e782b8484 Implement bytes += bytes, bytes = int, int in bytes, bytes in bytes. Guido van Rossum <guido@python.org>* parents: 37960 diff changeset	348 static PyObject *
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	349 bytes_getitem(PyBytesObject *self, Py_ssize_t i)
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	350 {
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	351 if (i < 0)
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	352 i += Py_SIZE(self);
86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	353 if (i < 0 \|\| i >= Py_SIZE(self)) {
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	354 PyErr_SetString(PyExc_IndexError, "bytearray index out of range");
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	355 return NULL;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	356 }
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43947 diff changeset	357 return PyLong_FromLong((unsigned char)(self->ob_bytes[i]));
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	358 }
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	359
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	360 static PyObject *
40472 9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	361 bytes_subscript(PyBytesObject self, PyObject item)
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	362 {
40472 9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	363 if (PyIndex_Check(item)) {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	364 Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	365
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	366 if (i == -1 && PyErr_Occurred())
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	367 return NULL;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	368
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	369 if (i < 0)
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	370 i += PyBytes_GET_SIZE(self);
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	371
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	372 if (i < 0 \|\| i >= Py_SIZE(self)) {
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	373 PyErr_SetString(PyExc_IndexError, "bytearray index out of range");
40472 9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	374 return NULL;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	375 }
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43947 diff changeset	376 return PyLong_FromLong((unsigned char)(self->ob_bytes[i]));
40472 9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	377 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	378 else if (PySlice_Check(item)) {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	379 Py_ssize_t start, stop, step, slicelength, cur, i;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	380 if (PySlice_GetIndicesEx((PySliceObject *)item,
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	381 PyBytes_GET_SIZE(self),
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	382 &start, &stop, &step, &slicelength) < 0) {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	383 return NULL;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	384 }
41448 458c8db2e946 Clean up trailing whitespace. Guido van Rossum <guido@python.org> parents: 41426 diff changeset	385
40472 9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	386 if (slicelength <= 0)
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	387 return PyBytes_FromStringAndSize("", 0);
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	388 else if (step == 1) {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	389 return PyBytes_FromStringAndSize(self->ob_bytes + start,
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	390 slicelength);
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	391 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	392 else {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	393 char *source_buf = PyBytes_AS_STRING(self);
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	394 char result_buf = (char )PyMem_Malloc(slicelength);
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	395 PyObject *result;
41448 458c8db2e946 Clean up trailing whitespace. Guido van Rossum <guido@python.org> parents: 41426 diff changeset	396
40472 9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	397 if (result_buf == NULL)
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	398 return PyErr_NoMemory();
41448 458c8db2e946 Clean up trailing whitespace. Guido van Rossum <guido@python.org> parents: 41426 diff changeset	399
40472 9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	400 for (cur = start, i = 0; i < slicelength;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	401 cur += step, i++) {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	402 result_buf[i] = source_buf[cur];
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	403 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	404 result = PyBytes_FromStringAndSize(result_buf, slicelength);
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	405 PyMem_Free(result_buf);
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	406 return result;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	407 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	408 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	409 else {
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	410 PyErr_SetString(PyExc_TypeError, "bytearray indices must be integers");
40472 9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	411 return NULL;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	412 }
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	413 }
41448 458c8db2e946 Clean up trailing whitespace. Guido van Rossum <guido@python.org> parents: 41426 diff changeset	414
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	415 static int
40472 9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	416 bytes_setslice(PyBytesObject *self, Py_ssize_t lo, Py_ssize_t hi,
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	417 PyObject *values)
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	418 {
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	419 Py_ssize_t avail, needed;
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	420 void *bytes;
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43321 diff changeset	421 Py_buffer vbytes;
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: 42499 diff changeset	422 int res = 0;
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: 42499 diff changeset	423
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: 42499 diff changeset	424 vbytes.len = -1;
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	425 if (values == (PyObject *)self) {
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: 42499 diff changeset	426 /* Make a copy and call this function recursively */
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	427 int err;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	428 values = PyBytes_FromObject(values);
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	429 if (values == NULL)
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	430 return -1;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	431 err = bytes_setslice(self, lo, hi, values);
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	432 Py_DECREF(values);
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	433 return err;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	434 }
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	435 if (values == NULL) {
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	436 /* del b[lo:hi] */
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	437 bytes = NULL;
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	438 needed = 0;
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	439 }
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	440 else {
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: 42499 diff changeset	441 if (_getbuffer(values, &vbytes) < 0) {
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: 42499 diff changeset	442 PyErr_Format(PyExc_TypeError,
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: 42499 diff changeset	443 "can't set bytes slice from %.100s",
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	444 Py_TYPE(values)->tp_name);
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: 42499 diff changeset	445 return -1;
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: 42499 diff changeset	446 }
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: 42499 diff changeset	447 needed = vbytes.len;
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: 42499 diff changeset	448 bytes = vbytes.buf;
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	449 }
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	450
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	451 if (lo < 0)
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	452 lo = 0;
39643 3dd61ffd049e Fix buglet in slice assignment of bytesobjects: assigning to b[3:0] ('stop' Thomas Wouters <thomas@python.org> parents: 39631 diff changeset	453 if (hi < lo)
3dd61ffd049e Fix buglet in slice assignment of bytesobjects: assigning to b[3:0] ('stop' Thomas Wouters <thomas@python.org> parents: 39631 diff changeset	454 hi = lo;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	455 if (hi > Py_SIZE(self))
86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	456 hi = Py_SIZE(self);
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	457
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	458 avail = hi - lo;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	459 if (avail < 0)
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	460 lo = hi = avail = 0;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	461
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	462 if (avail != needed) {
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	463 if (avail > needed) {
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	464 /*
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	465 0 lo hi old_size
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	466 \| \|<----avail----->\|<-----tomove------>\|
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	467 \| \|<-needed->\|<-----tomove------>\|
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	468 0 lo new_hi new_size
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	469 */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	470 memmove(self->ob_bytes + lo + needed, self->ob_bytes + hi,
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	471 Py_SIZE(self) - hi);
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	472 }
42975 71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	473 /* XXX(nnorwitz): need to verify this can't overflow! */
40472 9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	474 if (PyBytes_Resize((PyObject *)self,
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	475 Py_SIZE(self) + needed - avail) < 0) {
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: 42499 diff changeset	476 res = -1;
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: 42499 diff changeset	477 goto finish;
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: 42499 diff changeset	478 }
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	479 if (avail < needed) {
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	480 /*
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	481 0 lo hi old_size
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	482 \| \|<-avail->\|<-----tomove------>\|
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	483 \| \|<----needed---->\|<-----tomove------>\|
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	484 0 lo new_hi new_size
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	485 */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	486 memmove(self->ob_bytes + lo + needed, self->ob_bytes + hi,
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	487 Py_SIZE(self) - lo - needed);
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	488 }
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	489 }
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	490
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	491 if (needed > 0)
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	492 memcpy(self->ob_bytes + lo, bytes, needed);
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	493
42779 4b7036dc76d5 Whitespace cleanup. Guido van Rossum <guido@python.org> parents: 42669 diff changeset	494
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: 42499 diff changeset	495 finish:
42779 4b7036dc76d5 Whitespace cleanup. Guido van Rossum <guido@python.org> parents: 42669 diff changeset	496 if (vbytes.len != -1)
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: 42499 diff changeset	497 PyObject_ReleaseBuffer(values, &vbytes);
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: 42499 diff changeset	498 return res;
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	499 }
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	500
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	501 static int
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	502 bytes_setitem(PyBytesObject self, Py_ssize_t i, PyObject value)
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	503 {
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	504 Py_ssize_t ival;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	505
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	506 if (i < 0)
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	507 i += Py_SIZE(self);
86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	508
86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	509 if (i < 0 \|\| i >= Py_SIZE(self)) {
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	510 PyErr_SetString(PyExc_IndexError, "bytearray index out of range");
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	511 return -1;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	512 }
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	513
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	514 if (value == NULL)
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	515 return bytes_setslice(self, i, i+1, NULL);
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	516
39631 8d71f9a6c1c3 Make bytesobject raise ValueError instead of TypeError again (thanks, Nick) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	517 ival = PyNumber_AsSsize_t(value, PyExc_ValueError);
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	518 if (ival == -1 && PyErr_Occurred())
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	519 return -1;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	520
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	521 if (ival < 0 \|\| ival >= 256) {
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	522 PyErr_SetString(PyExc_ValueError, "byte must be in range(0, 256)");
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	523 return -1;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	524 }
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	525
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	526 self->ob_bytes[i] = ival;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	527 return 0;
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	528 }
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	529
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	530 static int
40472 9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	531 bytes_ass_subscript(PyBytesObject self, PyObject item, PyObject *values)
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	532 {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	533 Py_ssize_t start, stop, step, slicelen, needed;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	534 char *bytes;
41448 458c8db2e946 Clean up trailing whitespace. Guido van Rossum <guido@python.org> parents: 41426 diff changeset	535
40472 9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	536 if (PyIndex_Check(item)) {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	537 Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	538
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	539 if (i == -1 && PyErr_Occurred())
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	540 return -1;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	541
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	542 if (i < 0)
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	543 i += PyBytes_GET_SIZE(self);
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	544
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	545 if (i < 0 \|\| i >= Py_SIZE(self)) {
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	546 PyErr_SetString(PyExc_IndexError, "bytearray index out of range");
40472 9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	547 return -1;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	548 }
41448 458c8db2e946 Clean up trailing whitespace. Guido van Rossum <guido@python.org> parents: 41426 diff changeset	549
40472 9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	550 if (values == NULL) {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	551 /* Fall through to slice assignment */
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	552 start = i;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	553 stop = i + 1;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	554 step = 1;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	555 slicelen = 1;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	556 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	557 else {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	558 Py_ssize_t ival = PyNumber_AsSsize_t(values, PyExc_ValueError);
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	559 if (ival == -1 && PyErr_Occurred())
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	560 return -1;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	561 if (ival < 0 \|\| ival >= 256) {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	562 PyErr_SetString(PyExc_ValueError,
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	563 "byte must be in range(0, 256)");
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	564 return -1;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	565 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	566 self->ob_bytes[i] = (char)ival;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	567 return 0;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	568 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	569 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	570 else if (PySlice_Check(item)) {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	571 if (PySlice_GetIndicesEx((PySliceObject *)item,
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	572 PyBytes_GET_SIZE(self),
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	573 &start, &stop, &step, &slicelen) < 0) {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	574 return -1;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	575 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	576 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	577 else {
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	578 PyErr_SetString(PyExc_TypeError, "bytearray indices must be integer");
40472 9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	579 return -1;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	580 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	581
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	582 if (values == NULL) {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	583 bytes = NULL;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	584 needed = 0;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	585 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	586 else if (values == (PyObject *)self \|\| !PyBytes_Check(values)) {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	587 /* Make a copy an call this function recursively */
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	588 int err;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	589 values = PyBytes_FromObject(values);
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	590 if (values == NULL)
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	591 return -1;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	592 err = bytes_ass_subscript(self, item, values);
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	593 Py_DECREF(values);
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	594 return err;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	595 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	596 else {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	597 assert(PyBytes_Check(values));
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	598 bytes = ((PyBytesObject *)values)->ob_bytes;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	599 needed = Py_SIZE(values);
40472 9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	600 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	601 /* Make sure b[5:2] = ... inserts before 5, not before 2. */
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	602 if ((step < 0 && start < stop) \|\|
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	603 (step > 0 && start > stop))
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	604 stop = start;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	605 if (step == 1) {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	606 if (slicelen != needed) {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	607 if (slicelen > needed) {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	608 /*
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	609 0 start stop old_size
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	610 \| \|<---slicelen--->\|<-----tomove------>\|
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	611 \| \|<-needed->\|<-----tomove------>\|
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	612 0 lo new_hi new_size
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	613 */
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	614 memmove(self->ob_bytes + start + needed, self->ob_bytes + stop,
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	615 Py_SIZE(self) - stop);
40472 9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	616 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	617 if (PyBytes_Resize((PyObject *)self,
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	618 Py_SIZE(self) + needed - slicelen) < 0)
40472 9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	619 return -1;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	620 if (slicelen < needed) {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	621 /*
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	622 0 lo hi old_size
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	623 \| \|<-avail->\|<-----tomove------>\|
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	624 \| \|<----needed---->\|<-----tomove------>\|
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	625 0 lo new_hi new_size
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	626 */
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	627 memmove(self->ob_bytes + start + needed, self->ob_bytes + stop,
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	628 Py_SIZE(self) - start - needed);
40472 9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	629 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	630 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	631
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	632 if (needed > 0)
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	633 memcpy(self->ob_bytes + start, bytes, needed);
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	634
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	635 return 0;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	636 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	637 else {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	638 if (needed == 0) {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	639 /* Delete slice */
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	640 Py_ssize_t cur, i;
41448 458c8db2e946 Clean up trailing whitespace. Guido van Rossum <guido@python.org> parents: 41426 diff changeset	641
40472 9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	642 if (step < 0) {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	643 stop = start + 1;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	644 start = stop + step * (slicelen - 1) - 1;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	645 step = -step;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	646 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	647 for (cur = start, i = 0;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	648 i < slicelen; cur += step, i++) {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	649 Py_ssize_t lim = step - 1;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	650
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	651 if (cur + step >= PyBytes_GET_SIZE(self))
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	652 lim = PyBytes_GET_SIZE(self) - cur - 1;
41448 458c8db2e946 Clean up trailing whitespace. Guido van Rossum <guido@python.org> parents: 41426 diff changeset	653
40472 9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	654 memmove(self->ob_bytes + cur - i,
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	655 self->ob_bytes + cur + 1, lim);
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	656 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	657 /* Move the tail of the bytes, in one chunk */
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	658 cur = start + slicelen*step;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	659 if (cur < PyBytes_GET_SIZE(self)) {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	660 memmove(self->ob_bytes + cur - slicelen,
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	661 self->ob_bytes + cur,
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	662 PyBytes_GET_SIZE(self) - cur);
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	663 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	664 if (PyBytes_Resize((PyObject *)self,
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	665 PyBytes_GET_SIZE(self) - slicelen) < 0)
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	666 return -1;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	667
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	668 return 0;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	669 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	670 else {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	671 /* Assign slice */
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	672 Py_ssize_t cur, i;
41448 458c8db2e946 Clean up trailing whitespace. Guido van Rossum <guido@python.org> parents: 41426 diff changeset	673
40472 9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	674 if (needed != slicelen) {
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	675 PyErr_Format(PyExc_ValueError,
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	676 "attempt to assign bytes of size %zd "
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	677 "to extended slice of size %zd",
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	678 needed, slicelen);
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	679 return -1;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	680 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	681 for (cur = start, i = 0; i < slicelen; cur += step, i++)
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	682 self->ob_bytes[cur] = bytes[i];
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	683 return 0;
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	684 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	685 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	686 }
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	687
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	688 static int
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	689 bytes_init(PyBytesObject self, PyObject args, PyObject *kwds)
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	690 {
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	691 static char *kwlist[] = {"source", "encoding", "errors", 0};
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	692 PyObject *arg = NULL;
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	693 const char *encoding = NULL;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	694 const char *errors = NULL;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	695 Py_ssize_t count;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	696 PyObject *it;
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	697 PyObject (iternext)(PyObject *);
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	698
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	699 if (Py_SIZE(self) != 0) {
38115 a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	700 /* Empty previous contents (yes, do this first of all!) */
a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	701 if (PyBytes_Resize((PyObject *)self, 0) < 0)
a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	702 return -1;
a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	703 }
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	704
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	705 /* Parse arguments */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	706 if (!PyArg_ParseTupleAndKeywords(args, kwds, "\|Oss:bytes", kwlist,
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	707 &arg, &encoding, &errors))
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	708 return -1;
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	709
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	710 /* Make a quick exit if no first argument */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	711 if (arg == NULL) {
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	712 if (encoding != NULL \|\| errors != NULL) {
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	713 PyErr_SetString(PyExc_TypeError,
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	714 "encoding or errors without sequence argument");
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	715 return -1;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	716 }
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	717 return 0;
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	718 }
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	719
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	720 if (PyUnicode_Check(arg)) {
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	721 /* Encode via the codec registry */
41598 ca448c607b14 Make all of test_bytes pass (except pickling, which is too badly busted). Guido van Rossum <guido@python.org> parents: 41597 diff changeset	722 PyObject encoded, new;
42975 71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	723 if (encoding == NULL) {
71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	724 PyErr_SetString(PyExc_TypeError,
71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	725 "string argument without an encoding");
71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	726 return -1;
71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	727 }
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	728 encoded = PyCodec_Encode(arg, encoding, errors);
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	729 if (encoded == NULL)
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	730 return -1;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	731 assert(PyString_Check(encoded));
42975 71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	732 new = bytes_iconcat(self, encoded);
71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	733 Py_DECREF(encoded);
71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	734 if (new == NULL)
71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	735 return -1;
71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	736 Py_DECREF(new);
71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	737 return 0;
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	738 }
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	739
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	740 /* If it's not unicode, there can't be encoding or errors */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	741 if (encoding != NULL \|\| errors != NULL) {
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	742 PyErr_SetString(PyExc_TypeError,
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	743 "encoding or errors without a string argument");
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	744 return -1;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	745 }
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	746
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	747 /* Is it an int? */
39631 8d71f9a6c1c3 Make bytesobject raise ValueError instead of TypeError again (thanks, Nick) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	748 count = PyNumber_AsSsize_t(arg, PyExc_ValueError);
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	749 if (count == -1 && PyErr_Occurred())
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	750 PyErr_Clear();
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	751 else {
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	752 if (count < 0) {
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	753 PyErr_SetString(PyExc_ValueError, "negative count");
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	754 return -1;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	755 }
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	756 if (count > 0) {
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	757 if (PyBytes_Resize((PyObject *)self, count))
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	758 return -1;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	759 memset(self->ob_bytes, 0, count);
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	760 }
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	761 return 0;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	762 }
42779 4b7036dc76d5 Whitespace cleanup. Guido van Rossum <guido@python.org> parents: 42669 diff changeset	763
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	764 /* Use the buffer API */
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: 42499 diff changeset	765 if (PyObject_CheckBuffer(arg)) {
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	766 Py_ssize_t size;
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43321 diff changeset	767 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: 42499 diff changeset	768 if (PyObject_GetBuffer(arg, &view, PyBUF_FULL_RO) < 0)
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	769 return -1;
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: 42499 diff changeset	770 size = view.len;
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: 42499 diff changeset	771 if (PyBytes_Resize((PyObject *)self, size) < 0) goto fail;
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: 42499 diff changeset	772 if (PyBuffer_ToContiguous(self->ob_bytes, &view, size, 'C') < 0)
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: 42499 diff changeset	773 goto fail;
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: 42499 diff changeset	774 PyObject_ReleaseBuffer(arg, &view);
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	775 return 0;
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: 42499 diff changeset	776 fail:
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: 42499 diff changeset	777 PyObject_ReleaseBuffer(arg, &view);
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: 42499 diff changeset	778 return -1;
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	779 }
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	780
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	781 /* XXX Optimize this if the arguments is a list, tuple */
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	782
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	783 /* Get the iterator */
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	784 it = PyObject_GetIter(arg);
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	785 if (it == NULL)
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	786 return -1;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	787 iternext = *Py_TYPE(it)->tp_iternext;
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	788
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	789 /* Run the iterator to exhaustion */
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	790 for (;;) {
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	791 PyObject *item;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	792 Py_ssize_t value;
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	793
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	794 /* Get the next item */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	795 item = iternext(it);
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	796 if (item == NULL) {
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	797 if (PyErr_Occurred()) {
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	798 if (!PyErr_ExceptionMatches(PyExc_StopIteration))
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	799 goto error;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	800 PyErr_Clear();
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	801 }
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	802 break;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	803 }
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	804
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	805 /* Interpret it as an int (__index__) */
39631 8d71f9a6c1c3 Make bytesobject raise ValueError instead of TypeError again (thanks, Nick) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	806 value = PyNumber_AsSsize_t(item, PyExc_ValueError);
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	807 Py_DECREF(item);
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	808 if (value == -1 && PyErr_Occurred())
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	809 goto error;
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	810
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	811 /* Range check */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	812 if (value < 0 \|\| value >= 256) {
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	813 PyErr_SetString(PyExc_ValueError,
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	814 "bytes must be in range(0, 256)");
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	815 goto error;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	816 }
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	817
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	818 /* Append the byte */
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	819 if (Py_SIZE(self) < self->ob_alloc)
86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	820 Py_SIZE(self)++;
86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	821 else if (PyBytes_Resize((PyObject *)self, Py_SIZE(self)+1) < 0)
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	822 goto error;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	823 self->ob_bytes[Py_SIZE(self)-1] = value;
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	824 }
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	825
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	826 /* Clean up and return success */
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	827 Py_DECREF(it);
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	828 return 0;
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	829
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	830 error:
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	831 /* Error handling when it != NULL */
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	832 Py_DECREF(it);
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	833 return -1;
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	834 }
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	835
40898 b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	836 /* Mostly copied from string_repr, but without the
b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	837 "smart quote" functionality. */
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	838 static PyObject *
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	839 bytes_repr(PyBytesObject *self)
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	840 {
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41668 diff changeset	841 static const char *hexdigits = "0123456789abcdef";
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	842 const char *quote_prefix = "bytearray(b";
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	843 const char *quote_postfix = ")";
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	844 Py_ssize_t length = Py_SIZE(self);
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	845 /* 14 == strlen(quote_prefix) + 2 + strlen(quote_postfix) */
cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	846 size_t newsize = 14 + 4 * length;
40898 b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	847 PyObject *v;
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	848 if (newsize > PY_SSIZE_T_MAX \|\| newsize / 4 - 3 != length) {
40898 b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	849 PyErr_SetString(PyExc_OverflowError,
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	850 "bytearray object is too large to make repr");
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	851 return NULL;
40898 b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	852 }
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41668 diff changeset	853 v = PyUnicode_FromUnicode(NULL, newsize);
40898 b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	854 if (v == NULL) {
b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	855 return NULL;
b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	856 }
b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	857 else {
b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	858 register Py_ssize_t i;
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41668 diff changeset	859 register Py_UNICODE c;
b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41668 diff changeset	860 register Py_UNICODE *p;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	861 int quote;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	862
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	863 /* Figure out which quote to use; single is preferred */
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	864 quote = '\'';
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	865 {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	866 char test, start;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	867 start = PyBytes_AS_STRING(self);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	868 for (test = start; test < start+length; ++test) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	869 if (*test == '"') {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	870 quote = '\''; /* back to single */
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	871 goto decided;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	872 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	873 else if (*test == '\'')
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	874 quote = '"';
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	875 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	876 decided:
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	877 ;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	878 }
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	879
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41668 diff changeset	880 p = PyUnicode_AS_UNICODE(v);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	881 while (*quote_prefix)
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	882 p++ = quote_prefix++;
40898 b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	883 *p++ = quote;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	884
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	885 for (i = 0; i < length; i++) {
40898 b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	886 /* There's at least enough room for a hex escape
b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	887 and a closing quote. */
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41668 diff changeset	888 assert(newsize - (p - PyUnicode_AS_UNICODE(v)) >= 5);
40898 b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	889 c = self->ob_bytes[i];
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	890 if (c == '\'' \|\| c == '\\')
40898 b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	891 p++ = '\\', p++ = c;
b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	892 else if (c == '\t')
b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	893 p++ = '\\', p++ = 't';
b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	894 else if (c == '\n')
b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	895 p++ = '\\', p++ = 'n';
b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	896 else if (c == '\r')
b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	897 p++ = '\\', p++ = 'r';
b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	898 else if (c == 0)
41648 bc6ad63cd5f1 repr(b"\0") should return b"\x00", not the (unusual) b"\0". Guido van Rossum <guido@python.org> parents: 41598 diff changeset	899 p++ = '\\', p++ = 'x', p++ = '0', p++ = '0';
40898 b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	900 else if (c < ' ' \|\| c >= 0x7f) {
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41668 diff changeset	901 *p++ = '\\';
b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41668 diff changeset	902 *p++ = 'x';
b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41668 diff changeset	903 *p++ = hexdigits[(c & 0xf0) >> 4];
b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41668 diff changeset	904 *p++ = hexdigits[c & 0xf];
40898 b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	905 }
b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	906 else
b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	907 *p++ = c;
b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	908 }
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41668 diff changeset	909 assert(newsize - (p - PyUnicode_AS_UNICODE(v)) >= 1);
40898 b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	910 *p++ = quote;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	911 while (*quote_postfix) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	912 p++ = quote_postfix++;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	913 }
40898 b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	914 *p = '\0';
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41668 diff changeset	915 if (PyUnicode_Resize(&v, (p - PyUnicode_AS_UNICODE(v)))) {
b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41668 diff changeset	916 Py_DECREF(v);
b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41668 diff changeset	917 return NULL;
b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41668 diff changeset	918 }
40898 b58a4374ac21 Make bytes_repr return a string containing a b"" literal. Georg Brandl <georg@python.org> parents: 40472 diff changeset	919 return v;
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	920 }
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	921 }
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	922
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	923 static PyObject *
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	924 bytes_str(PyObject *op)
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	925 {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	926 if (Py_BytesWarningFlag) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	927 if (PyErr_WarnEx(PyExc_BytesWarning,
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	928 "str() on a bytearray instance", 1))
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	929 return NULL;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	930 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	931 return bytes_repr((PyBytesObject*)op);
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	932 }
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	933
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	934 static PyObject *
41411 339015d98b78 For Make Benefit Glorious Nation of Backwards Compatibility, Guido van Rossum <guido@python.org> parents: 40982 diff changeset	935 bytes_richcompare(PyObject self, PyObject other, int op)
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	936 {
41411 339015d98b78 For Make Benefit Glorious Nation of Backwards Compatibility, Guido van Rossum <guido@python.org> parents: 40982 diff changeset	937 Py_ssize_t self_size, other_size;
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43321 diff changeset	938 Py_buffer self_bytes, other_bytes;
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	939 PyObject *res;
41411 339015d98b78 For Make Benefit Glorious Nation of Backwards Compatibility, Guido van Rossum <guido@python.org> parents: 40982 diff changeset	940 Py_ssize_t minsize;
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	941 int cmp;
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	942
43001 eafc8b23589d Make it an error to compare a bytes object and a Unicode object. Jeremy Hylton <jeremy@alum.mit.edu> parents: 42975 diff changeset	943 /* Bytes can be compared to anything that supports the (binary)
eafc8b23589d Make it an error to compare a bytes object and a Unicode object. Jeremy Hylton <jeremy@alum.mit.edu> parents: 42975 diff changeset	944 buffer API. Except that a comparison with Unicode is always an
eafc8b23589d Make it an error to compare a bytes object and a Unicode object. Jeremy Hylton <jeremy@alum.mit.edu> parents: 42975 diff changeset	945 error, even if the comparison is for equality. */
eafc8b23589d Make it an error to compare a bytes object and a Unicode object. Jeremy Hylton <jeremy@alum.mit.edu> parents: 42975 diff changeset	946 if (PyObject_IsInstance(self, (PyObject*)&PyUnicode_Type) \|\|
eafc8b23589d Make it an error to compare a bytes object and a Unicode object. Jeremy Hylton <jeremy@alum.mit.edu> parents: 42975 diff changeset	947 PyObject_IsInstance(other, (PyObject*)&PyUnicode_Type)) {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	948 if (Py_BytesWarningFlag && op == Py_EQ) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	949 if (PyErr_WarnEx(PyExc_BytesWarning,
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	950 "Comparsion between bytearray and string", 1))
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	951 return NULL;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	952 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	953
43508 47c02791ec6b Patch #1049 by Thomas Lee. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	954 Py_INCREF(Py_NotImplemented);
47c02791ec6b Patch #1049 by Thomas Lee. Guido van Rossum <guido@python.org> parents: 43423 diff changeset	955 return Py_NotImplemented;
43001 eafc8b23589d Make it an error to compare a bytes object and a Unicode object. Jeremy Hylton <jeremy@alum.mit.edu> parents: 42975 diff changeset	956 }
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	957
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	958 self_size = _getbuffer(self, &self_bytes);
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	959 if (self_size < 0) {
42975 71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	960 PyErr_Clear();
41412 522b3f35d0eb Bytes should never equal unicode. Guido van Rossum <guido@python.org> parents: 41411 diff changeset	961 Py_INCREF(Py_NotImplemented);
522b3f35d0eb Bytes should never equal unicode. Guido van Rossum <guido@python.org> parents: 41411 diff changeset	962 return Py_NotImplemented;
522b3f35d0eb Bytes should never equal unicode. Guido van Rossum <guido@python.org> parents: 41411 diff changeset	963 }
41411 339015d98b78 For Make Benefit Glorious Nation of Backwards Compatibility, Guido van Rossum <guido@python.org> parents: 40982 diff changeset	964
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	965 other_size = _getbuffer(other, &other_bytes);
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	966 if (other_size < 0) {
42975 71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	967 PyErr_Clear();
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: 42499 diff changeset	968 PyObject_ReleaseBuffer(self, &self_bytes);
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	969 Py_INCREF(Py_NotImplemented);
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	970 return Py_NotImplemented;
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	971 }
41411 339015d98b78 For Make Benefit Glorious Nation of Backwards Compatibility, Guido van Rossum <guido@python.org> parents: 40982 diff changeset	972
339015d98b78 For Make Benefit Glorious Nation of Backwards Compatibility, Guido van Rossum <guido@python.org> parents: 40982 diff changeset	973 if (self_size != other_size && (op == Py_EQ \|\| op == Py_NE)) {
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	974 /* Shortcut: if the lengths differ, the objects differ */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	975 cmp = (op == Py_NE);
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	976 }
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	977 else {
41411 339015d98b78 For Make Benefit Glorious Nation of Backwards Compatibility, Guido van Rossum <guido@python.org> parents: 40982 diff changeset	978 minsize = self_size;
339015d98b78 For Make Benefit Glorious Nation of Backwards Compatibility, Guido van Rossum <guido@python.org> parents: 40982 diff changeset	979 if (other_size < minsize)
339015d98b78 For Make Benefit Glorious Nation of Backwards Compatibility, Guido van Rossum <guido@python.org> parents: 40982 diff changeset	980 minsize = other_size;
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	981
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: 42499 diff changeset	982 cmp = memcmp(self_bytes.buf, other_bytes.buf, minsize);
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	983 /* In ISO C, memcmp() guarantees to use unsigned bytes! */
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	984
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	985 if (cmp == 0) {
41411 339015d98b78 For Make Benefit Glorious Nation of Backwards Compatibility, Guido van Rossum <guido@python.org> parents: 40982 diff changeset	986 if (self_size < other_size)
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	987 cmp = -1;
41411 339015d98b78 For Make Benefit Glorious Nation of Backwards Compatibility, Guido van Rossum <guido@python.org> parents: 40982 diff changeset	988 else if (self_size > other_size)
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	989 cmp = 1;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	990 }
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	991
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	992 switch (op) {
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	993 case Py_LT: cmp = cmp < 0; break;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	994 case Py_LE: cmp = cmp <= 0; break;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	995 case Py_EQ: cmp = cmp == 0; break;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	996 case Py_NE: cmp = cmp != 0; break;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	997 case Py_GT: cmp = cmp > 0; break;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	998 case Py_GE: cmp = cmp >= 0; break;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	999 }
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	1000 }
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	1001
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	1002 res = cmp ? Py_True : Py_False;
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: 42499 diff changeset	1003 PyObject_ReleaseBuffer(self, &self_bytes);
42779 4b7036dc76d5 Whitespace cleanup. Guido van Rossum <guido@python.org> parents: 42669 diff changeset	1004 PyObject_ReleaseBuffer(other, &other_bytes);
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	1005 Py_INCREF(res);
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	1006 return res;
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	1007 }
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	1008
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	1009 static void
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	1010 bytes_dealloc(PyBytesObject *self)
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	1011 {
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	1012 if (self->ob_bytes != 0) {
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	1013 PyMem_Free(self->ob_bytes);
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	1014 }
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	1015 Py_TYPE(self)->tp_free((PyObject *)self);
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	1016 }
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	1017
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1018
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1019 /* -------------------------------------------------------------------- */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1020 /* Methods */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1021
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1022 #define STRINGLIB_CHAR char
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1023 #define STRINGLIB_CMP memcmp
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1024 #define STRINGLIB_LEN PyBytes_GET_SIZE
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1025 #define STRINGLIB_STR PyBytes_AS_STRING
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1026 #define STRINGLIB_NEW PyBytes_FromStringAndSize
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1027 #define STRINGLIB_EMPTY nullbytes
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1028 #define STRINGLIB_CHECK_EXACT PyBytes_CheckExact
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1029 #define STRINGLIB_MUTABLE 1
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1030
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1031 #include "stringlib/fastsearch.h"
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1032 #include "stringlib/count.h"
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1033 #include "stringlib/find.h"
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1034 #include "stringlib/partition.h"
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1035 #include "stringlib/ctype.h"
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1036 #include "stringlib/transmogrify.h"
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1037
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1038
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1039 /* The following Py_LOCAL_INLINE and Py_LOCAL functions
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1040 were copied from the old char* style string object. */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1041
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1042 Py_LOCAL_INLINE(void)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1043 _adjust_indices(Py_ssize_t start, Py_ssize_t end, Py_ssize_t len)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1044 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1045 if (*end > len)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1046 *end = len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1047 else if (*end < 0)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1048 *end += len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1049 if (*end < 0)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1050 *end = 0;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1051 if (*start < 0)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1052 *start += len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1053 if (*start < 0)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1054 *start = 0;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1055 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1056
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1057
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1058 Py_LOCAL_INLINE(Py_ssize_t)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1059 bytes_find_internal(PyBytesObject self, PyObject args, int dir)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1060 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1061 PyObject *subobj;
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43321 diff changeset	1062 Py_buffer subbuf;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1063 Py_ssize_t start=0, end=PY_SSIZE_T_MAX;
43150 1bb63a32a6c8 Per Georg's suggestion, get rid of str.decode() (which always raises an Guido van Rossum <guido@python.org> parents: 43031 diff changeset	1064 Py_ssize_t res;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1065
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1066 if (!PyArg_ParseTuple(args, "O\|O&O&:find/rfind/index/rindex", &subobj,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1067 _PyEval_SliceIndex, &start, _PyEval_SliceIndex, &end))
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1068 return -2;
43150 1bb63a32a6c8 Per Georg's suggestion, get rid of str.decode() (which always raises an Guido van Rossum <guido@python.org> parents: 43031 diff changeset	1069 if (_getbuffer(subobj, &subbuf) < 0)
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1070 return -2;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1071 if (dir > 0)
43150 1bb63a32a6c8 Per Georg's suggestion, get rid of str.decode() (which always raises an Guido van Rossum <guido@python.org> parents: 43031 diff changeset	1072 res = stringlib_find_slice(
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1073 PyBytes_AS_STRING(self), PyBytes_GET_SIZE(self),
43150 1bb63a32a6c8 Per Georg's suggestion, get rid of str.decode() (which always raises an Guido van Rossum <guido@python.org> parents: 43031 diff changeset	1074 subbuf.buf, subbuf.len, start, end);
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1075 else
43150 1bb63a32a6c8 Per Georg's suggestion, get rid of str.decode() (which always raises an Guido van Rossum <guido@python.org> parents: 43031 diff changeset	1076 res = stringlib_rfind_slice(
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1077 PyBytes_AS_STRING(self), PyBytes_GET_SIZE(self),
43150 1bb63a32a6c8 Per Georg's suggestion, get rid of str.decode() (which always raises an Guido van Rossum <guido@python.org> parents: 43031 diff changeset	1078 subbuf.buf, subbuf.len, start, end);
1bb63a32a6c8 Per Georg's suggestion, get rid of str.decode() (which always raises an Guido van Rossum <guido@python.org> parents: 43031 diff changeset	1079 PyObject_ReleaseBuffer(subobj, &subbuf);
1bb63a32a6c8 Per Georg's suggestion, get rid of str.decode() (which always raises an Guido van Rossum <guido@python.org> parents: 43031 diff changeset	1080 return res;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1081 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1082
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1083 PyDoc_STRVAR(find__doc__,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1084 "B.find(sub [,start [,end]]) -> int\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1085 \n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1086 Return the lowest index in B where subsection sub is found,\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1087 such that sub is contained within s[start,end]. Optional\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1088 arguments start and end are interpreted as in slice notation.\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1089 \n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1090 Return -1 on failure.");
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1091
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1092 static PyObject *
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1093 bytes_find(PyBytesObject self, PyObject args)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1094 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1095 Py_ssize_t result = bytes_find_internal(self, args, +1);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1096 if (result == -2)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1097 return NULL;
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43947 diff changeset	1098 return PyLong_FromSsize_t(result);
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1099 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1100
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1101 PyDoc_STRVAR(count__doc__,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1102 "B.count(sub [,start [,end]]) -> int\n\
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1103 \n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1104 Return the number of non-overlapping occurrences of subsection sub in\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1105 bytes B[start:end]. Optional arguments start and end are interpreted\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1106 as in slice notation.");
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1107
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1108 static PyObject *
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1109 bytes_count(PyBytesObject self, PyObject args)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1110 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1111 PyObject *sub_obj;
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1112 const char *str = PyBytes_AS_STRING(self);
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1113 Py_ssize_t start = 0, end = PY_SSIZE_T_MAX;
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1114 Py_buffer vsub;
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1115 PyObject *count_obj;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1116
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1117 if (!PyArg_ParseTuple(args, "O\|O&O&:count", &sub_obj,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1118 _PyEval_SliceIndex, &start, _PyEval_SliceIndex, &end))
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1119 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1120
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1121 if (_getbuffer(sub_obj, &vsub) < 0)
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1122 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1123
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41769 diff changeset	1124 _adjust_indices(&start, &end, PyBytes_GET_SIZE(self));
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1125
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43947 diff changeset	1126 count_obj = PyLong_FromSsize_t(
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1127 stringlib_count(str + start, end - start, vsub.buf, vsub.len)
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1128 );
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1129 PyObject_ReleaseBuffer(sub_obj, &vsub);
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1130 return count_obj;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1131 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1132
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1133
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1134 PyDoc_STRVAR(index__doc__,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1135 "B.index(sub [,start [,end]]) -> int\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1136 \n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1137 Like B.find() but raise ValueError when the subsection is not found.");
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1138
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1139 static PyObject *
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1140 bytes_index(PyBytesObject self, PyObject args)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1141 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1142 Py_ssize_t result = bytes_find_internal(self, args, +1);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1143 if (result == -2)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1144 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1145 if (result == -1) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1146 PyErr_SetString(PyExc_ValueError,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1147 "subsection not found");
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1148 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1149 }
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43947 diff changeset	1150 return PyLong_FromSsize_t(result);
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1151 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1152
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1153
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1154 PyDoc_STRVAR(rfind__doc__,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1155 "B.rfind(sub [,start [,end]]) -> int\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1156 \n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1157 Return the highest index in B where subsection sub is found,\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1158 such that sub is contained within s[start,end]. Optional\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1159 arguments start and end are interpreted as in slice notation.\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1160 \n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1161 Return -1 on failure.");
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1162
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1163 static PyObject *
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1164 bytes_rfind(PyBytesObject self, PyObject args)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1165 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1166 Py_ssize_t result = bytes_find_internal(self, args, -1);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1167 if (result == -2)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1168 return NULL;
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43947 diff changeset	1169 return PyLong_FromSsize_t(result);
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1170 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1171
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1172
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1173 PyDoc_STRVAR(rindex__doc__,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1174 "B.rindex(sub [,start [,end]]) -> int\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1175 \n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1176 Like B.rfind() but raise ValueError when the subsection is not found.");
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1177
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1178 static PyObject *
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1179 bytes_rindex(PyBytesObject self, PyObject args)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1180 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1181 Py_ssize_t result = bytes_find_internal(self, args, -1);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1182 if (result == -2)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1183 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1184 if (result == -1) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1185 PyErr_SetString(PyExc_ValueError,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1186 "subsection not found");
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1187 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1188 }
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43947 diff changeset	1189 return PyLong_FromSsize_t(result);
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1190 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1191
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1192
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1193 static int
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1194 bytes_contains(PyObject self, PyObject arg)
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1195 {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1196 Py_ssize_t ival = PyNumber_AsSsize_t(arg, PyExc_ValueError);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1197 if (ival == -1 && PyErr_Occurred()) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1198 Py_buffer varg;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1199 int pos;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1200 PyErr_Clear();
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1201 if (_getbuffer(arg, &varg) < 0)
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1202 return -1;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	1203 pos = stringlib_find(PyBytes_AS_STRING(self), Py_SIZE(self),
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1204 varg.buf, varg.len, 0);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1205 PyObject_ReleaseBuffer(arg, &varg);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1206 return pos >= 0;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1207 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1208 if (ival < 0 \|\| ival >= 256) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1209 PyErr_SetString(PyExc_ValueError, "byte must be in range(0, 256)");
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1210 return -1;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1211 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1212
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	1213 return memchr(PyBytes_AS_STRING(self), ival, Py_SIZE(self)) != NULL;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1214 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1215
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1216
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1217 /* Matches the end (direction >= 0) or start (direction < 0) of self
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1218 * against substr, using the start and end arguments. Returns
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1219 * -1 on error, 0 if not found and 1 if found.
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1220 */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1221 Py_LOCAL(int)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1222 _bytes_tailmatch(PyBytesObject self, PyObject substr, Py_ssize_t start,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1223 Py_ssize_t end, int direction)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1224 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1225 Py_ssize_t len = PyBytes_GET_SIZE(self);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1226 const char* str;
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1227 Py_buffer vsubstr;
43632 0067a6ab4854 Issue 1267, continued. Guido van Rossum <guido@python.org> parents: 43576 diff changeset	1228 int rv = 0;
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1229
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1230 str = PyBytes_AS_STRING(self);
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1231
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1232 if (_getbuffer(substr, &vsubstr) < 0)
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1233 return -1;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1234
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1235 _adjust_indices(&start, &end, len);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1236
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1237 if (direction < 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1238 /* startswith */
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1239 if (start+vsubstr.len > len) {
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1240 goto done;
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1241 }
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1242 } else {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1243 /* endswith */
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1244 if (end-start < vsubstr.len \|\| start > len) {
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1245 goto done;
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1246 }
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1247
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1248 if (end-vsubstr.len > start)
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1249 start = end - vsubstr.len;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1250 }
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1251 if (end-start >= vsubstr.len)
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1252 rv = ! memcmp(str+start, vsubstr.buf, vsubstr.len);
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1253
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1254 done:
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1255 PyObject_ReleaseBuffer(substr, &vsubstr);
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1256 return rv;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1257 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1258
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1259
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1260 PyDoc_STRVAR(startswith__doc__,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1261 "B.startswith(prefix [,start [,end]]) -> bool\n\
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1262 \n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1263 Return True if B starts with the specified prefix, False otherwise.\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1264 With optional start, test B beginning at that position.\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1265 With optional end, stop comparing B at that position.\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1266 prefix can also be a tuple of strings to try.");
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1267
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1268 static PyObject *
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1269 bytes_startswith(PyBytesObject self, PyObject args)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1270 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1271 Py_ssize_t start = 0;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1272 Py_ssize_t end = PY_SSIZE_T_MAX;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1273 PyObject *subobj;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1274 int result;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1275
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1276 if (!PyArg_ParseTuple(args, "O\|O&O&:startswith", &subobj,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1277 _PyEval_SliceIndex, &start, _PyEval_SliceIndex, &end))
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1278 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1279 if (PyTuple_Check(subobj)) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1280 Py_ssize_t i;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1281 for (i = 0; i < PyTuple_GET_SIZE(subobj); i++) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1282 result = _bytes_tailmatch(self,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1283 PyTuple_GET_ITEM(subobj, i),
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1284 start, end, -1);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1285 if (result == -1)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1286 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1287 else if (result) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1288 Py_RETURN_TRUE;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1289 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1290 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1291 Py_RETURN_FALSE;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1292 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1293 result = _bytes_tailmatch(self, subobj, start, end, -1);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1294 if (result == -1)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1295 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1296 else
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1297 return PyBool_FromLong(result);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1298 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1299
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1300 PyDoc_STRVAR(endswith__doc__,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1301 "B.endswith(suffix [,start [,end]]) -> bool\n\
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1302 \n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1303 Return True if B ends with the specified suffix, False otherwise.\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1304 With optional start, test B beginning at that position.\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1305 With optional end, stop comparing B at that position.\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1306 suffix can also be a tuple of strings to try.");
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1307
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1308 static PyObject *
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1309 bytes_endswith(PyBytesObject self, PyObject args)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1310 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1311 Py_ssize_t start = 0;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1312 Py_ssize_t end = PY_SSIZE_T_MAX;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1313 PyObject *subobj;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1314 int result;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1315
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1316 if (!PyArg_ParseTuple(args, "O\|O&O&:endswith", &subobj,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1317 _PyEval_SliceIndex, &start, _PyEval_SliceIndex, &end))
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1318 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1319 if (PyTuple_Check(subobj)) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1320 Py_ssize_t i;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1321 for (i = 0; i < PyTuple_GET_SIZE(subobj); i++) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1322 result = _bytes_tailmatch(self,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1323 PyTuple_GET_ITEM(subobj, i),
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1324 start, end, +1);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1325 if (result == -1)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1326 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1327 else if (result) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1328 Py_RETURN_TRUE;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1329 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1330 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1331 Py_RETURN_FALSE;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1332 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1333 result = _bytes_tailmatch(self, subobj, start, end, +1);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1334 if (result == -1)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1335 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1336 else
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1337 return PyBool_FromLong(result);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1338 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1339
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1340
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1341 PyDoc_STRVAR(translate__doc__,
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	1342 "B.translate(table[, deletechars]) -> bytearray\n\
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1343 \n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1344 Return a copy of B, where all characters occurring in the\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1345 optional argument deletechars are removed, and the remaining\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1346 characters have been mapped through the given translation\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	1347 table, which must be a bytes object of length 256.");
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1348
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1349 static PyObject *
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1350 bytes_translate(PyBytesObject self, PyObject args)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1351 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1352 register char input, output;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1353 register const char *table;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1354 register Py_ssize_t i, c, changed = 0;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1355 PyObject input_obj = (PyObject)self;
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1356 const char *output_start;
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1357 Py_ssize_t inlen;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1358 PyObject *result;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1359 int trans_table[256];
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1360 PyObject tableobj, delobj = NULL;
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1361 Py_buffer vtable, vdel;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1362
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1363 if (!PyArg_UnpackTuple(args, "translate", 1, 2,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1364 &tableobj, &delobj))
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1365 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1366
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1367 if (_getbuffer(tableobj, &vtable) < 0)
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1368 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1369
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1370 if (vtable.len != 256) {
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1371 PyErr_SetString(PyExc_ValueError,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1372 "translation table must be 256 characters long");
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1373 result = NULL;
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1374 goto done;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1375 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1376
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1377 if (delobj != NULL) {
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1378 if (_getbuffer(delobj, &vdel) < 0) {
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1379 result = NULL;
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1380 goto done;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1381 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1382 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1383 else {
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1384 vdel.buf = NULL;
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1385 vdel.len = 0;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1386 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1387
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1388 table = (const char *)vtable.buf;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1389 inlen = PyBytes_GET_SIZE(input_obj);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1390 result = PyBytes_FromStringAndSize((char *)NULL, inlen);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1391 if (result == NULL)
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1392 goto done;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1393 output_start = output = PyBytes_AsString(result);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1394 input = PyBytes_AS_STRING(input_obj);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1395
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1396 if (vdel.len == 0) {
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1397 /* If no deletions are required, use faster code */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1398 for (i = inlen; --i >= 0; ) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1399 c = Py_CHARMASK(*input++);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1400 if (Py_CHARMASK((*output++ = table[c])) != c)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1401 changed = 1;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1402 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1403 if (changed \|\| !PyBytes_CheckExact(input_obj))
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1404 goto done;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1405 Py_DECREF(result);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1406 Py_INCREF(input_obj);
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1407 result = input_obj;
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1408 goto done;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1409 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1410
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1411 for (i = 0; i < 256; i++)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1412 trans_table[i] = Py_CHARMASK(table[i]);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1413
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1414 for (i = 0; i < vdel.len; i++)
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1415 trans_table[(int) Py_CHARMASK( ((unsigned char*)vdel.buf)[i] )] = -1;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1416
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1417 for (i = inlen; --i >= 0; ) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1418 c = Py_CHARMASK(*input++);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1419 if (trans_table[c] != -1)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1420 if (Py_CHARMASK(*output++ = (char)trans_table[c]) == c)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1421 continue;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1422 changed = 1;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1423 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1424 if (!changed && PyBytes_CheckExact(input_obj)) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1425 Py_DECREF(result);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1426 Py_INCREF(input_obj);
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1427 result = input_obj;
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1428 goto done;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1429 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1430 /* Fix the size of the resulting string */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1431 if (inlen > 0)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1432 PyBytes_Resize(result, output - output_start);
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1433
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1434 done:
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1435 PyObject_ReleaseBuffer(tableobj, &vtable);
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1436 if (delobj != NULL)
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	1437 PyObject_ReleaseBuffer(delobj, &vdel);
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1438 return result;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1439 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1440
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1441
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1442 #define FORWARD 1
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1443 #define REVERSE -1
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1444
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1445 /* find and count characters and substrings */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1446
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1447 #define findchar(target, target_len, c) \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1448 ((char )memchr((const void )(target), c, target_len))
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1449
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1450 /* Don't call if length < 2 */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1451 #define Py_STRING_MATCH(target, offset, pattern, length) \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1452 (target[offset] == pattern[0] && \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1453 target[offset+length-1] == pattern[length-1] && \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1454 !memcmp(target+offset+1, pattern+1, length-2) )
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1455
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1456
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1457 /* Bytes ops must return a string. */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1458 /* If the object is subclass of bytes, create a copy */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1459 Py_LOCAL(PyBytesObject *)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1460 return_self(PyBytesObject *self)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1461 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1462 if (PyBytes_CheckExact(self)) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1463 Py_INCREF(self);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1464 return (PyBytesObject *)self;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1465 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1466 return (PyBytesObject *)PyBytes_FromStringAndSize(
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1467 PyBytes_AS_STRING(self),
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1468 PyBytes_GET_SIZE(self));
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1469 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1470
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1471 Py_LOCAL_INLINE(Py_ssize_t)
43687 6ab64f6b4c03 Fix some Py_ssize_t warnings on Win64 that were probably bugs Neal Norwitz <nnorwitz@gmail.com> parents: 43632 diff changeset	1472 countchar(const char *target, Py_ssize_t target_len, char c, Py_ssize_t maxcount)
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1473 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1474 Py_ssize_t count=0;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1475 const char *start=target;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1476 const char *end=target+target_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1477
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1478 while ( (start=findchar(start, end-start, c)) != NULL ) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1479 count++;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1480 if (count >= maxcount)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1481 break;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1482 start += 1;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1483 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1484 return count;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1485 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1486
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1487 Py_LOCAL(Py_ssize_t)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1488 findstring(const char *target, Py_ssize_t target_len,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1489 const char *pattern, Py_ssize_t pattern_len,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1490 Py_ssize_t start,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1491 Py_ssize_t end,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1492 int direction)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1493 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1494 if (start < 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1495 start += target_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1496 if (start < 0)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1497 start = 0;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1498 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1499 if (end > target_len) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1500 end = target_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1501 } else if (end < 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1502 end += target_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1503 if (end < 0)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1504 end = 0;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1505 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1506
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1507 /* zero-length substrings always match at the first attempt */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1508 if (pattern_len == 0)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1509 return (direction > 0) ? start : end;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1510
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1511 end -= pattern_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1512
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1513 if (direction < 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1514 for (; end >= start; end--)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1515 if (Py_STRING_MATCH(target, end, pattern, pattern_len))
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1516 return end;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1517 } else {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1518 for (; start <= end; start++)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1519 if (Py_STRING_MATCH(target, start, pattern, pattern_len))
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1520 return start;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1521 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1522 return -1;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1523 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1524
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1525 Py_LOCAL_INLINE(Py_ssize_t)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1526 countstring(const char *target, Py_ssize_t target_len,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1527 const char *pattern, Py_ssize_t pattern_len,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1528 Py_ssize_t start,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1529 Py_ssize_t end,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1530 int direction, Py_ssize_t maxcount)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1531 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1532 Py_ssize_t count=0;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1533
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1534 if (start < 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1535 start += target_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1536 if (start < 0)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1537 start = 0;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1538 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1539 if (end > target_len) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1540 end = target_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1541 } else if (end < 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1542 end += target_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1543 if (end < 0)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1544 end = 0;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1545 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1546
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1547 /* zero-length substrings match everywhere */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1548 if (pattern_len == 0 \|\| maxcount == 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1549 if (target_len+1 < maxcount)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1550 return target_len+1;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1551 return maxcount;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1552 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1553
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1554 end -= pattern_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1555 if (direction < 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1556 for (; (end >= start); end--)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1557 if (Py_STRING_MATCH(target, end, pattern, pattern_len)) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1558 count++;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1559 if (--maxcount <= 0) break;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1560 end -= pattern_len-1;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1561 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1562 } else {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1563 for (; (start <= end); start++)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1564 if (Py_STRING_MATCH(target, start, pattern, pattern_len)) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1565 count++;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1566 if (--maxcount <= 0)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1567 break;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1568 start += pattern_len-1;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1569 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1570 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1571 return count;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1572 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1573
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1574
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1575 /* Algorithms for different cases of string replacement */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1576
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1577 /* len(self)>=1, from="", len(to)>=1, maxcount>=1 */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1578 Py_LOCAL(PyBytesObject *)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1579 replace_interleave(PyBytesObject *self,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1580 const char *to_s, Py_ssize_t to_len,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1581 Py_ssize_t maxcount)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1582 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1583 char self_s, result_s;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1584 Py_ssize_t self_len, result_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1585 Py_ssize_t count, i, product;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1586 PyBytesObject *result;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1587
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1588 self_len = PyBytes_GET_SIZE(self);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1589
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1590 /* 1 at the end plus 1 after every character */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1591 count = self_len+1;
41448 458c8db2e946 Clean up trailing whitespace. Guido van Rossum <guido@python.org> parents: 41426 diff changeset	1592 if (maxcount < count)
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1593 count = maxcount;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1594
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1595 /* Check for overflow */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1596 /* result_len = count * to_len + self_len; */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1597 product = count * to_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1598 if (product / to_len != count) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1599 PyErr_SetString(PyExc_OverflowError,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1600 "replace string is too long");
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1601 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1602 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1603 result_len = product + self_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1604 if (result_len < 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1605 PyErr_SetString(PyExc_OverflowError,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1606 "replace string is too long");
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1607 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1608 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1609
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1610 if (! (result = (PyBytesObject *)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1611 PyBytes_FromStringAndSize(NULL, result_len)) )
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1612 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1613
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1614 self_s = PyBytes_AS_STRING(self);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1615 result_s = PyBytes_AS_STRING(result);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1616
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1617 /* TODO: special case single character, which doesn't need memcpy */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1618
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1619 /* Lay the first one down (guaranteed this will occur) */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1620 Py_MEMCPY(result_s, to_s, to_len);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1621 result_s += to_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1622 count -= 1;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1623
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1624 for (i=0; i<count; i++) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1625 result_s++ = self_s++;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1626 Py_MEMCPY(result_s, to_s, to_len);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1627 result_s += to_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1628 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1629
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1630 /* Copy the rest of the original string */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1631 Py_MEMCPY(result_s, self_s, self_len-i);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1632
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1633 return result;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1634 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1635
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1636 /* Special case for deleting a single character */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1637 /* len(self)>=1, len(from)==1, to="", maxcount>=1 */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1638 Py_LOCAL(PyBytesObject *)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1639 replace_delete_single_character(PyBytesObject *self,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1640 char from_c, Py_ssize_t maxcount)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1641 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1642 char self_s, result_s;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1643 char start, next, *end;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1644 Py_ssize_t self_len, result_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1645 Py_ssize_t count;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1646 PyBytesObject *result;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1647
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1648 self_len = PyBytes_GET_SIZE(self);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1649 self_s = PyBytes_AS_STRING(self);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1650
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1651 count = countchar(self_s, self_len, from_c, maxcount);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1652 if (count == 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1653 return return_self(self);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1654 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1655
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1656 result_len = self_len - count; /* from_len == 1 */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1657 assert(result_len>=0);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1658
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1659 if ( (result = (PyBytesObject *)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1660 PyBytes_FromStringAndSize(NULL, result_len)) == NULL)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1661 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1662 result_s = PyBytes_AS_STRING(result);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1663
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1664 start = self_s;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1665 end = self_s + self_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1666 while (count-- > 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1667 next = findchar(start, end-start, from_c);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1668 if (next == NULL)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1669 break;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1670 Py_MEMCPY(result_s, start, next-start);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1671 result_s += (next-start);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1672 start = next+1;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1673 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1674 Py_MEMCPY(result_s, start, end-start);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1675
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1676 return result;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1677 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1678
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1679 /* len(self)>=1, len(from)>=2, to="", maxcount>=1 */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1680
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1681 Py_LOCAL(PyBytesObject *)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1682 replace_delete_substring(PyBytesObject *self,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1683 const char *from_s, Py_ssize_t from_len,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1684 Py_ssize_t maxcount)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1685 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1686 char self_s, result_s;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1687 char start, next, *end;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1688 Py_ssize_t self_len, result_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1689 Py_ssize_t count, offset;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1690 PyBytesObject *result;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1691
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1692 self_len = PyBytes_GET_SIZE(self);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1693 self_s = PyBytes_AS_STRING(self);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1694
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1695 count = countstring(self_s, self_len,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1696 from_s, from_len,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1697 0, self_len, 1,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1698 maxcount);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1699
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1700 if (count == 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1701 /* no matches */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1702 return return_self(self);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1703 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1704
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1705 result_len = self_len - (count * from_len);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1706 assert (result_len>=0);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1707
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1708 if ( (result = (PyBytesObject *)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1709 PyBytes_FromStringAndSize(NULL, result_len)) == NULL )
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1710 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1711
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1712 result_s = PyBytes_AS_STRING(result);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1713
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1714 start = self_s;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1715 end = self_s + self_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1716 while (count-- > 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1717 offset = findstring(start, end-start,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1718 from_s, from_len,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1719 0, end-start, FORWARD);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1720 if (offset == -1)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1721 break;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1722 next = start + offset;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1723
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1724 Py_MEMCPY(result_s, start, next-start);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1725
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1726 result_s += (next-start);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1727 start = next+from_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1728 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1729 Py_MEMCPY(result_s, start, end-start);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1730 return result;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1731 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1732
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1733 /* len(self)>=1, len(from)==len(to)==1, maxcount>=1 */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1734 Py_LOCAL(PyBytesObject *)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1735 replace_single_character_in_place(PyBytesObject *self,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1736 char from_c, char to_c,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1737 Py_ssize_t maxcount)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1738 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1739 char self_s, result_s, start, end, *next;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1740 Py_ssize_t self_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1741 PyBytesObject *result;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1742
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1743 /* The result string will be the same size */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1744 self_s = PyBytes_AS_STRING(self);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1745 self_len = PyBytes_GET_SIZE(self);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1746
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1747 next = findchar(self_s, self_len, from_c);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1748
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1749 if (next == NULL) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1750 /* No matches; return the original bytes */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1751 return return_self(self);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1752 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1753
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1754 /* Need to make a new bytes */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1755 result = (PyBytesObject *) PyBytes_FromStringAndSize(NULL, self_len);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1756 if (result == NULL)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1757 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1758 result_s = PyBytes_AS_STRING(result);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1759 Py_MEMCPY(result_s, self_s, self_len);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1760
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1761 /* change everything in-place, starting with this one */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1762 start = result_s + (next-self_s);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1763 *start = to_c;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1764 start++;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1765 end = result_s + self_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1766
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1767 while (--maxcount > 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1768 next = findchar(start, end-start, from_c);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1769 if (next == NULL)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1770 break;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1771 *next = to_c;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1772 start = next+1;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1773 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1774
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1775 return result;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1776 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1777
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1778 /* len(self)>=1, len(from)==len(to)>=2, maxcount>=1 */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1779 Py_LOCAL(PyBytesObject *)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1780 replace_substring_in_place(PyBytesObject *self,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1781 const char *from_s, Py_ssize_t from_len,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1782 const char *to_s, Py_ssize_t to_len,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1783 Py_ssize_t maxcount)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1784 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1785 char result_s, start, *end;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1786 char *self_s;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1787 Py_ssize_t self_len, offset;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1788 PyBytesObject *result;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1789
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1790 /* The result bytes will be the same size */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1791
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1792 self_s = PyBytes_AS_STRING(self);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1793 self_len = PyBytes_GET_SIZE(self);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1794
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1795 offset = findstring(self_s, self_len,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1796 from_s, from_len,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1797 0, self_len, FORWARD);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1798 if (offset == -1) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1799 /* No matches; return the original bytes */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1800 return return_self(self);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1801 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1802
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1803 /* Need to make a new bytes */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1804 result = (PyBytesObject *) PyBytes_FromStringAndSize(NULL, self_len);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1805 if (result == NULL)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1806 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1807 result_s = PyBytes_AS_STRING(result);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1808 Py_MEMCPY(result_s, self_s, self_len);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1809
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1810 /* change everything in-place, starting with this one */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1811 start = result_s + offset;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1812 Py_MEMCPY(start, to_s, from_len);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1813 start += from_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1814 end = result_s + self_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1815
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1816 while ( --maxcount > 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1817 offset = findstring(start, end-start,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1818 from_s, from_len,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1819 0, end-start, FORWARD);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1820 if (offset==-1)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1821 break;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1822 Py_MEMCPY(start+offset, to_s, from_len);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1823 start += offset+from_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1824 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1825
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1826 return result;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1827 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1828
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1829 /* len(self)>=1, len(from)==1, len(to)>=2, maxcount>=1 */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1830 Py_LOCAL(PyBytesObject *)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1831 replace_single_character(PyBytesObject *self,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1832 char from_c,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1833 const char *to_s, Py_ssize_t to_len,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1834 Py_ssize_t maxcount)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1835 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1836 char self_s, result_s;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1837 char start, next, *end;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1838 Py_ssize_t self_len, result_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1839 Py_ssize_t count, product;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1840 PyBytesObject *result;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1841
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1842 self_s = PyBytes_AS_STRING(self);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1843 self_len = PyBytes_GET_SIZE(self);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1844
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1845 count = countchar(self_s, self_len, from_c, maxcount);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1846 if (count == 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1847 /* no matches, return unchanged */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1848 return return_self(self);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1849 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1850
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1851 /* use the difference between current and new, hence the "-1" */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1852 /* result_len = self_len + count * (to_len-1) */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1853 product = count * (to_len-1);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1854 if (product / (to_len-1) != count) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1855 PyErr_SetString(PyExc_OverflowError, "replace bytes is too long");
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1856 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1857 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1858 result_len = self_len + product;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1859 if (result_len < 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1860 PyErr_SetString(PyExc_OverflowError, "replace bytes is too long");
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1861 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1862 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1863
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1864 if ( (result = (PyBytesObject *)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1865 PyBytes_FromStringAndSize(NULL, result_len)) == NULL)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1866 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1867 result_s = PyBytes_AS_STRING(result);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1868
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1869 start = self_s;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1870 end = self_s + self_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1871 while (count-- > 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1872 next = findchar(start, end-start, from_c);
41448 458c8db2e946 Clean up trailing whitespace. Guido van Rossum <guido@python.org> parents: 41426 diff changeset	1873 if (next == NULL)
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1874 break;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1875
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1876 if (next == start) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1877 /* replace with the 'to' */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1878 Py_MEMCPY(result_s, to_s, to_len);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1879 result_s += to_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1880 start += 1;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1881 } else {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1882 /* copy the unchanged old then the 'to' */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1883 Py_MEMCPY(result_s, start, next-start);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1884 result_s += (next-start);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1885 Py_MEMCPY(result_s, to_s, to_len);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1886 result_s += to_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1887 start = next+1;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1888 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1889 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1890 /* Copy the remainder of the remaining bytes */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1891 Py_MEMCPY(result_s, start, end-start);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1892
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1893 return result;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1894 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1895
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1896 /* len(self)>=1, len(from)>=2, len(to)>=2, maxcount>=1 */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1897 Py_LOCAL(PyBytesObject *)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1898 replace_substring(PyBytesObject *self,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1899 const char *from_s, Py_ssize_t from_len,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1900 const char *to_s, Py_ssize_t to_len,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1901 Py_ssize_t maxcount)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1902 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1903 char self_s, result_s;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1904 char start, next, *end;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1905 Py_ssize_t self_len, result_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1906 Py_ssize_t count, offset, product;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1907 PyBytesObject *result;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1908
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1909 self_s = PyBytes_AS_STRING(self);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1910 self_len = PyBytes_GET_SIZE(self);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1911
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1912 count = countstring(self_s, self_len,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1913 from_s, from_len,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1914 0, self_len, FORWARD, maxcount);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1915 if (count == 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1916 /* no matches, return unchanged */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1917 return return_self(self);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1918 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1919
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1920 /* Check for overflow */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1921 /* result_len = self_len + count * (to_len-from_len) */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1922 product = count * (to_len-from_len);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1923 if (product / (to_len-from_len) != count) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1924 PyErr_SetString(PyExc_OverflowError, "replace bytes is too long");
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1925 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1926 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1927 result_len = self_len + product;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1928 if (result_len < 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1929 PyErr_SetString(PyExc_OverflowError, "replace bytes is too long");
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1930 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1931 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1932
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1933 if ( (result = (PyBytesObject *)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1934 PyBytes_FromStringAndSize(NULL, result_len)) == NULL)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1935 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1936 result_s = PyBytes_AS_STRING(result);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1937
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1938 start = self_s;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1939 end = self_s + self_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1940 while (count-- > 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1941 offset = findstring(start, end-start,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1942 from_s, from_len,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1943 0, end-start, FORWARD);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1944 if (offset == -1)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1945 break;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1946 next = start+offset;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1947 if (next == start) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1948 /* replace with the 'to' */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1949 Py_MEMCPY(result_s, to_s, to_len);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1950 result_s += to_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1951 start += from_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1952 } else {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1953 /* copy the unchanged old then the 'to' */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1954 Py_MEMCPY(result_s, start, next-start);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1955 result_s += (next-start);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1956 Py_MEMCPY(result_s, to_s, to_len);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1957 result_s += to_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1958 start = next+from_len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1959 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1960 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1961 /* Copy the remainder of the remaining bytes */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1962 Py_MEMCPY(result_s, start, end-start);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1963
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1964 return result;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1965 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1966
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1967
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1968 Py_LOCAL(PyBytesObject *)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1969 replace(PyBytesObject *self,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1970 const char *from_s, Py_ssize_t from_len,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1971 const char *to_s, Py_ssize_t to_len,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1972 Py_ssize_t maxcount)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1973 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1974 if (maxcount < 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1975 maxcount = PY_SSIZE_T_MAX;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1976 } else if (maxcount == 0 \|\| PyBytes_GET_SIZE(self) == 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1977 /* nothing to do; return the original bytes */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1978 return return_self(self);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1979 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1980
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1981 if (maxcount == 0 \|\|
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1982 (from_len == 0 && to_len == 0)) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1983 /* nothing to do; return the original bytes */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1984 return return_self(self);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1985 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1986
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1987 /* Handle zero-length special cases */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1988
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1989 if (from_len == 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1990 /* insert the 'to' bytes everywhere. */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1991 /* >>> "Python".replace("", ".") */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1992 /* '.P.y.t.h.o.n.' */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1993 return replace_interleave(self, to_s, to_len, maxcount);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1994 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1995
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1996 /* Except for "".replace("", "A") == "A" there is no way beyond this */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1997 /* point for an empty self bytes to generate a non-empty bytes */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1998 /* Special case so the remaining code always gets a non-empty bytes */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	1999 if (PyBytes_GET_SIZE(self) == 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2000 return return_self(self);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2001 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2002
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2003 if (to_len == 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2004 /* delete all occurances of 'from' bytes */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2005 if (from_len == 1) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2006 return replace_delete_single_character(
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2007 self, from_s[0], maxcount);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2008 } else {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2009 return replace_delete_substring(self, from_s, from_len, maxcount);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2010 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2011 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2012
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2013 /* Handle special case where both bytes have the same length */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2014
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2015 if (from_len == to_len) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2016 if (from_len == 1) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2017 return replace_single_character_in_place(
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2018 self,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2019 from_s[0],
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2020 to_s[0],
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2021 maxcount);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2022 } else {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2023 return replace_substring_in_place(
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2024 self, from_s, from_len, to_s, to_len, maxcount);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2025 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2026 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2027
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2028 /* Otherwise use the more generic algorithms */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2029 if (from_len == 1) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2030 return replace_single_character(self, from_s[0],
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2031 to_s, to_len, maxcount);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2032 } else {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2033 /* len('from')>=2, len('to')>=1 */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2034 return replace_substring(self, from_s, from_len, to_s, to_len, maxcount);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2035 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2036 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2037
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	2038
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2039 PyDoc_STRVAR(replace__doc__,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2040 "B.replace(old, new[, count]) -> bytes\n\
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2041 \n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2042 Return a copy of B with all occurrences of subsection\n\
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2043 old replaced by new. If the optional argument count is\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2044 given, only the first count occurrences are replaced.");
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2045
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2046 static PyObject *
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2047 bytes_replace(PyBytesObject self, PyObject args)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2048 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2049 Py_ssize_t count = -1;
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: 42499 diff changeset	2050 PyObject from, to, *res;
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43321 diff changeset	2051 Py_buffer vfrom, vto;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2052
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2053 if (!PyArg_ParseTuple(args, "OO\|n:replace", &from, &to, &count))
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2054 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2055
42975 71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	2056 if (_getbuffer(from, &vfrom) < 0)
71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	2057 return NULL;
71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	2058 if (_getbuffer(to, &vto) < 0) {
71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	2059 PyObject_ReleaseBuffer(from, &vfrom);
71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	2060 return NULL;
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: 42499 diff changeset	2061 }
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: 42499 diff changeset	2062
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: 42499 diff changeset	2063 res = (PyObject )replace((PyBytesObject ) self,
42975 71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	2064 vfrom.buf, vfrom.len,
71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	2065 vto.buf, vto.len, count);
71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	2066
71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	2067 PyObject_ReleaseBuffer(from, &vfrom);
71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	2068 PyObject_ReleaseBuffer(to, &vto);
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: 42499 diff changeset	2069 return res;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2070 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2071
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2072
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2073 /* Overallocate the initial list to reduce the number of reallocs for small
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2074 split sizes. Eg, "A A A A A A A A A A".split() (10 elements) has three
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2075 resizes, to sizes 4, 8, then 16. Most observed string splits are for human
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2076 text (roughly 11 words per line) and field delimited data (usually 1-10
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2077 fields). For large strings the split algorithms are bandwidth limited
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2078 so increasing the preallocation likely will not improve things.*/
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2079
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2080 #define MAX_PREALLOC 12
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2081
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2082 /* 5 splits gives 6 elements */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2083 #define PREALLOC_SIZE(maxsplit) \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2084 (maxsplit >= MAX_PREALLOC ? MAX_PREALLOC : maxsplit+1)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2085
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2086 #define SPLIT_APPEND(data, left, right) \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2087 str = PyBytes_FromStringAndSize((data) + (left), \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2088 (right) - (left)); \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2089 if (str == NULL) \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2090 goto onError; \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2091 if (PyList_Append(list, str)) { \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2092 Py_DECREF(str); \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2093 goto onError; \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2094 } \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2095 else \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2096 Py_DECREF(str);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2097
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2098 #define SPLIT_ADD(data, left, right) { \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2099 str = PyBytes_FromStringAndSize((data) + (left), \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2100 (right) - (left)); \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2101 if (str == NULL) \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2102 goto onError; \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2103 if (count < MAX_PREALLOC) { \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2104 PyList_SET_ITEM(list, count, str); \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2105 } else { \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2106 if (PyList_Append(list, str)) { \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2107 Py_DECREF(str); \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2108 goto onError; \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2109 } \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2110 else \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2111 Py_DECREF(str); \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2112 } \
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2113 count++; }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2114
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2115 /* Always force the list to the expected size. */
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	2116 #define FIX_PREALLOC_SIZE(list) Py_SIZE(list) = count
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2117
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2118
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2119 Py_LOCAL_INLINE(PyObject *)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2120 split_char(const char *s, Py_ssize_t len, char ch, Py_ssize_t maxcount)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2121 {
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2122 register Py_ssize_t i, j, count = 0;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2123 PyObject *str;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2124 PyObject *list = PyList_New(PREALLOC_SIZE(maxcount));
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2125
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2126 if (list == NULL)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2127 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2128
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2129 i = j = 0;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2130 while ((j < len) && (maxcount-- > 0)) {
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2131 for(; j < len; j++) {
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2132 /* I found that using memchr makes no difference */
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2133 if (s[j] == ch) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2134 SPLIT_ADD(s, i, j);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2135 i = j = j + 1;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2136 break;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2137 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2138 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2139 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2140 if (i <= len) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2141 SPLIT_ADD(s, i, len);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2142 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2143 FIX_PREALLOC_SIZE(list);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2144 return list;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2145
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2146 onError:
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2147 Py_DECREF(list);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2148 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2149 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2150
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2151
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2152 Py_LOCAL_INLINE(PyObject *)
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2153 split_whitespace(const char *s, Py_ssize_t len, Py_ssize_t maxcount)
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2154 {
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2155 register Py_ssize_t i, j, count = 0;
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2156 PyObject *str;
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2157 PyObject *list = PyList_New(PREALLOC_SIZE(maxcount));
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2158
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2159 if (list == NULL)
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2160 return NULL;
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2161
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2162 for (i = j = 0; i < len; ) {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2163 /* find a token */
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2164 while (i < len && ISSPACE(s[i]))
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2165 i++;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2166 j = i;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2167 while (i < len && !ISSPACE(s[i]))
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2168 i++;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2169 if (j < i) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2170 if (maxcount-- <= 0)
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2171 break;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2172 SPLIT_ADD(s, j, i);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2173 while (i < len && ISSPACE(s[i]))
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2174 i++;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2175 j = i;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2176 }
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2177 }
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2178 if (j < len) {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2179 SPLIT_ADD(s, j, len);
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2180 }
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2181 FIX_PREALLOC_SIZE(list);
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2182 return list;
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2183
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2184 onError:
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2185 Py_DECREF(list);
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2186 return NULL;
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2187 }
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2188
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2189 PyDoc_STRVAR(split__doc__,
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2190 "B.split([sep[, maxsplit]]) -> list of bytearray\n\
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2191 \n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2192 Return a list of the sections in B, using sep as the delimiter.\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2193 If sep is not given, B is split on ASCII whitespace characters\n\
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2194 (space, tab, return, newline, formfeed, vertical tab).\n\
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2195 If maxsplit is given, at most maxsplit splits are done.");
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2196
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2197 static PyObject *
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2198 bytes_split(PyBytesObject self, PyObject args)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2199 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2200 Py_ssize_t len = PyBytes_GET_SIZE(self), n, i, j;
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2201 Py_ssize_t maxsplit = -1, count = 0;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2202 const char s = PyBytes_AS_STRING(self), sub;
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2203 PyObject list, str, *subobj = Py_None;
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43321 diff changeset	2204 Py_buffer vsub;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2205 #ifdef USE_FAST
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2206 Py_ssize_t pos;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2207 #endif
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2208
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2209 if (!PyArg_ParseTuple(args, "\|On:split", &subobj, &maxsplit))
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2210 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2211 if (maxsplit < 0)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2212 maxsplit = PY_SSIZE_T_MAX;
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2213
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2214 if (subobj == Py_None)
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2215 return split_whitespace(s, len, maxsplit);
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2216
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2217 if (_getbuffer(subobj, &vsub) < 0)
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2218 return NULL;
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2219 sub = vsub.buf;
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2220 n = vsub.len;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2221
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2222 if (n == 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2223 PyErr_SetString(PyExc_ValueError, "empty separator");
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2224 PyObject_ReleaseBuffer(subobj, &vsub);
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2225 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2226 }
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2227 if (n == 1)
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2228 return split_char(s, len, sub[0], maxsplit);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2229
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2230 list = PyList_New(PREALLOC_SIZE(maxsplit));
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2231 if (list == NULL) {
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2232 PyObject_ReleaseBuffer(subobj, &vsub);
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2233 return NULL;
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2234 }
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2235
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2236 #ifdef USE_FAST
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2237 i = j = 0;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2238 while (maxsplit-- > 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2239 pos = fastsearch(s+i, len-i, sub, n, FAST_SEARCH);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2240 if (pos < 0)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2241 break;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2242 j = i+pos;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2243 SPLIT_ADD(s, i, j);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2244 i = j + n;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2245 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2246 #else
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2247 i = j = 0;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2248 while ((j+n <= len) && (maxsplit-- > 0)) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2249 for (; j+n <= len; j++) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2250 if (Py_STRING_MATCH(s, j, sub, n)) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2251 SPLIT_ADD(s, i, j);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2252 i = j = j + n;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2253 break;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2254 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2255 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2256 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2257 #endif
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2258 SPLIT_ADD(s, i, len);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2259 FIX_PREALLOC_SIZE(list);
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2260 PyObject_ReleaseBuffer(subobj, &vsub);
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2261 return list;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2262
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2263 onError:
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2264 Py_DECREF(list);
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2265 PyObject_ReleaseBuffer(subobj, &vsub);
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2266 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2267 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2268
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2269 /* stringlib's partition shares nullbytes in some cases.
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2270 undo this, we don't want the nullbytes to be shared. */
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2271 static PyObject *
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2272 make_nullbytes_unique(PyObject *result)
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2273 {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2274 if (result != NULL) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2275 int i;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2276 assert(PyTuple_Check(result));
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2277 assert(PyTuple_GET_SIZE(result) == 3);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2278 for (i = 0; i < 3; i++) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2279 if (PyTuple_GET_ITEM(result, i) == (PyObject *)nullbytes) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2280 PyObject *new = PyBytes_FromStringAndSize(NULL, 0);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2281 if (new == NULL) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2282 Py_DECREF(result);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2283 result = NULL;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2284 break;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2285 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2286 Py_DECREF(nullbytes);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2287 PyTuple_SET_ITEM(result, i, new);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2288 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2289 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2290 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2291 return result;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2292 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2293
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2294 PyDoc_STRVAR(partition__doc__,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2295 "B.partition(sep) -> (head, sep, tail)\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2296 \n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2297 Searches for the separator sep in B, and returns the part before it,\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2298 the separator itself, and the part after it. If the separator is not\n\
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2299 found, returns B and two empty bytearray objects.");
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2300
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2301 static PyObject *
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2302 bytes_partition(PyBytesObject self, PyObject sep_obj)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2303 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2304 PyObject bytesep, result;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2305
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2306 bytesep = PyBytes_FromObject(sep_obj);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2307 if (! bytesep)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2308 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2309
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2310 result = stringlib_partition(
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2311 (PyObject*) self,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2312 PyBytes_AS_STRING(self), PyBytes_GET_SIZE(self),
41448 458c8db2e946 Clean up trailing whitespace. Guido van Rossum <guido@python.org> parents: 41426 diff changeset	2313 bytesep,
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2314 PyBytes_AS_STRING(bytesep), PyBytes_GET_SIZE(bytesep)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2315 );
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2316
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2317 Py_DECREF(bytesep);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2318 return make_nullbytes_unique(result);
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2319 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2320
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2321 PyDoc_STRVAR(rpartition__doc__,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2322 "B.rpartition(sep) -> (tail, sep, head)\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2323 \n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2324 Searches for the separator sep in B, starting at the end of B,\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2325 and returns the part before it, the separator itself, and the\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2326 part after it. If the separator is not found, returns two empty\n\
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2327 bytearray objects and B.");
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2328
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2329 static PyObject *
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2330 bytes_rpartition(PyBytesObject self, PyObject sep_obj)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2331 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2332 PyObject bytesep, result;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2333
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2334 bytesep = PyBytes_FromObject(sep_obj);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2335 if (! bytesep)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2336 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2337
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2338 result = stringlib_rpartition(
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2339 (PyObject*) self,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2340 PyBytes_AS_STRING(self), PyBytes_GET_SIZE(self),
41448 458c8db2e946 Clean up trailing whitespace. Guido van Rossum <guido@python.org> parents: 41426 diff changeset	2341 bytesep,
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2342 PyBytes_AS_STRING(bytesep), PyBytes_GET_SIZE(bytesep)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2343 );
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2344
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2345 Py_DECREF(bytesep);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2346 return make_nullbytes_unique(result);
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2347 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2348
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2349 Py_LOCAL_INLINE(PyObject *)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2350 rsplit_char(const char *s, Py_ssize_t len, char ch, Py_ssize_t maxcount)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2351 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2352 register Py_ssize_t i, j, count=0;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2353 PyObject *str;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2354 PyObject *list = PyList_New(PREALLOC_SIZE(maxcount));
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2355
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2356 if (list == NULL)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2357 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2358
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2359 i = j = len - 1;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2360 while ((i >= 0) && (maxcount-- > 0)) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2361 for (; i >= 0; i--) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2362 if (s[i] == ch) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2363 SPLIT_ADD(s, i + 1, j + 1);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2364 j = i = i - 1;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2365 break;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2366 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2367 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2368 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2369 if (j >= -1) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2370 SPLIT_ADD(s, 0, j + 1);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2371 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2372 FIX_PREALLOC_SIZE(list);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2373 if (PyList_Reverse(list) < 0)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2374 goto onError;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2375
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2376 return list;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2377
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2378 onError:
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2379 Py_DECREF(list);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2380 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2381 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2382
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2383 Py_LOCAL_INLINE(PyObject *)
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2384 rsplit_whitespace(const char *s, Py_ssize_t len, Py_ssize_t maxcount)
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2385 {
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2386 register Py_ssize_t i, j, count = 0;
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2387 PyObject *str;
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2388 PyObject *list = PyList_New(PREALLOC_SIZE(maxcount));
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2389
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2390 if (list == NULL)
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2391 return NULL;
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2392
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2393 for (i = j = len - 1; i >= 0; ) {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2394 /* find a token */
45050 e9764a695809 Fixed #1969: split and rsplit in bytearray are inconsistent Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	2395 while (i >= 0 && ISSPACE(s[i]))
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2396 i--;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2397 j = i;
45050 e9764a695809 Fixed #1969: split and rsplit in bytearray are inconsistent Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	2398 while (i >= 0 && !ISSPACE(s[i]))
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2399 i--;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2400 if (j > i) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2401 if (maxcount-- <= 0)
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2402 break;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2403 SPLIT_ADD(s, i + 1, j + 1);
45050 e9764a695809 Fixed #1969: split and rsplit in bytearray are inconsistent Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	2404 while (i >= 0 && ISSPACE(s[i]))
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2405 i--;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2406 j = i;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2407 }
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2408 }
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2409 if (j >= 0) {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2410 SPLIT_ADD(s, 0, j + 1);
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2411 }
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2412 FIX_PREALLOC_SIZE(list);
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2413 if (PyList_Reverse(list) < 0)
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2414 goto onError;
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2415
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2416 return list;
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2417
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2418 onError:
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2419 Py_DECREF(list);
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2420 return NULL;
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2421 }
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2422
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2423 PyDoc_STRVAR(rsplit__doc__,
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2424 "B.rsplit(sep[, maxsplit]) -> list of bytearray\n\
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2425 \n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2426 Return a list of the sections in B, using sep as the delimiter,\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2427 starting at the end of B and working to the front.\n\
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2428 If sep is not given, B is split on ASCII whitespace characters\n\
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2429 (space, tab, return, newline, formfeed, vertical tab).\n\
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2430 If maxsplit is given, at most maxsplit splits are done.");
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2431
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2432 static PyObject *
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2433 bytes_rsplit(PyBytesObject self, PyObject args)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2434 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2435 Py_ssize_t len = PyBytes_GET_SIZE(self), n, i, j;
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2436 Py_ssize_t maxsplit = -1, count = 0;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2437 const char s = PyBytes_AS_STRING(self), sub;
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2438 PyObject list, str, *subobj = Py_None;
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43321 diff changeset	2439 Py_buffer vsub;
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2440
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2441 if (!PyArg_ParseTuple(args, "\|On:rsplit", &subobj, &maxsplit))
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2442 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2443 if (maxsplit < 0)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2444 maxsplit = PY_SSIZE_T_MAX;
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2445
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2446 if (subobj == Py_None)
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2447 return rsplit_whitespace(s, len, maxsplit);
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2448
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2449 if (_getbuffer(subobj, &vsub) < 0)
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2450 return NULL;
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2451 sub = vsub.buf;
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2452 n = vsub.len;
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2453
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2454 if (n == 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2455 PyErr_SetString(PyExc_ValueError, "empty separator");
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2456 PyObject_ReleaseBuffer(subobj, &vsub);
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2457 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2458 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2459 else if (n == 1)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2460 return rsplit_char(s, len, sub[0], maxsplit);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2461
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2462 list = PyList_New(PREALLOC_SIZE(maxsplit));
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2463 if (list == NULL) {
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2464 PyObject_ReleaseBuffer(subobj, &vsub);
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2465 return NULL;
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2466 }
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2467
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2468 j = len;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2469 i = j - n;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2470
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2471 while ( (i >= 0) && (maxsplit-- > 0) ) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2472 for (; i>=0; i--) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2473 if (Py_STRING_MATCH(s, i, sub, n)) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2474 SPLIT_ADD(s, i + n, j);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2475 j = i;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2476 i -= n;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2477 break;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2478 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2479 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2480 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2481 SPLIT_ADD(s, 0, j);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2482 FIX_PREALLOC_SIZE(list);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2483 if (PyList_Reverse(list) < 0)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2484 goto onError;
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2485 PyObject_ReleaseBuffer(subobj, &vsub);
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2486 return list;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2487
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2488 onError:
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2489 Py_DECREF(list);
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2490 PyObject_ReleaseBuffer(subobj, &vsub);
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2491 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2492 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2493
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2494 PyDoc_STRVAR(reverse__doc__,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2495 "B.reverse() -> None\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2496 \n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2497 Reverse the order of the values in B in place.");
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2498 static PyObject *
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2499 bytes_reverse(PyBytesObject self, PyObject unused)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2500 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2501 char swap, head, tail;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	2502 Py_ssize_t i, j, n = Py_SIZE(self);
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2503
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2504 j = n / 2;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2505 head = self->ob_bytes;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2506 tail = head + n - 1;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2507 for (i = 0; i < j; i++) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2508 swap = *head;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2509 head++ = tail;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2510 *tail-- = swap;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2511 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2512
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2513 Py_RETURN_NONE;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2514 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2515
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2516 PyDoc_STRVAR(insert__doc__,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2517 "B.insert(index, int) -> None\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2518 \n\
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2519 Insert a single item into the bytearray before the given index.");
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2520 static PyObject *
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2521 bytes_insert(PyBytesObject self, PyObject args)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2522 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2523 int value;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	2524 Py_ssize_t where, n = Py_SIZE(self);
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2525
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2526 if (!PyArg_ParseTuple(args, "ni:insert", &where, &value))
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2527 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2528
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2529 if (n == PY_SSIZE_T_MAX) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2530 PyErr_SetString(PyExc_OverflowError,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2531 "cannot add more objects to bytes");
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2532 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2533 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2534 if (value < 0 \|\| value >= 256) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2535 PyErr_SetString(PyExc_ValueError,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2536 "byte must be in range(0, 256)");
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2537 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2538 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2539 if (PyBytes_Resize((PyObject *)self, n + 1) < 0)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2540 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2541
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2542 if (where < 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2543 where += n;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2544 if (where < 0)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2545 where = 0;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2546 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2547 if (where > n)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2548 where = n;
40982 431b3238593e Fix off-by-one bug in memmove() call in bytes_insert(). Guido van Rossum <guido@python.org> parents: 40978 diff changeset	2549 memmove(self->ob_bytes + where + 1, self->ob_bytes + where, n - where);
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2550 self->ob_bytes[where] = value;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2551
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2552 Py_RETURN_NONE;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2553 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2554
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2555 PyDoc_STRVAR(append__doc__,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2556 "B.append(int) -> None\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2557 \n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2558 Append a single item to the end of B.");
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2559 static PyObject *
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2560 bytes_append(PyBytesObject self, PyObject arg)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2561 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2562 int value;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	2563 Py_ssize_t n = Py_SIZE(self);
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2564
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2565 if (! _getbytevalue(arg, &value))
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2566 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2567 if (n == PY_SSIZE_T_MAX) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2568 PyErr_SetString(PyExc_OverflowError,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2569 "cannot add more objects to bytes");
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2570 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2571 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2572 if (PyBytes_Resize((PyObject *)self, n + 1) < 0)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2573 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2574
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2575 self->ob_bytes[n] = value;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2576
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2577 Py_RETURN_NONE;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2578 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2579
44137 825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2580 PyDoc_STRVAR(extend__doc__,
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2581 "B.extend(iterable int) -> None\n\
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2582 \n\
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2583 Append all the elements from the iterator or sequence to the\n\
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2584 end of B.");
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2585 static PyObject *
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2586 bytes_extend(PyBytesObject self, PyObject arg)
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2587 {
46446 0fede4d1b14b Improved bytes_extend() to avoid making a full copy of the temporary Alexandre Vassalotti <alexandre@peadrop.com> parents: 46430 diff changeset	2588 PyObject it, item, *bytes_obj;
44137 825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2589 Py_ssize_t buf_size = 0, len = 0;
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2590 int value;
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2591 char *buf;
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2592
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2593 /* bytes_setslice code only accepts something supporting PEP 3118. */
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2594 if (PyObject_CheckBuffer(arg)) {
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	2595 if (bytes_setslice(self, Py_SIZE(self), Py_SIZE(self), arg) == -1)
44137 825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2596 return NULL;
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2597
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2598 Py_RETURN_NONE;
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2599 }
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2600
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2601 it = PyObject_GetIter(arg);
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2602 if (it == NULL)
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2603 return NULL;
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2604
44226 aad65a2424e3 Merged revisions 59376-59406 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44138 diff changeset	2605 /* Try to determine the length of the argument. 32 is abitrary. */
aad65a2424e3 Merged revisions 59376-59406 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44138 diff changeset	2606 buf_size = _PyObject_LengthHint(arg, 32);
44137 825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2607
46446 0fede4d1b14b Improved bytes_extend() to avoid making a full copy of the temporary Alexandre Vassalotti <alexandre@peadrop.com> parents: 46430 diff changeset	2608 bytes_obj = PyBytes_FromStringAndSize(NULL, buf_size);
0fede4d1b14b Improved bytes_extend() to avoid making a full copy of the temporary Alexandre Vassalotti <alexandre@peadrop.com> parents: 46430 diff changeset	2609 if (bytes_obj == NULL)
0fede4d1b14b Improved bytes_extend() to avoid making a full copy of the temporary Alexandre Vassalotti <alexandre@peadrop.com> parents: 46430 diff changeset	2610 return NULL;
0fede4d1b14b Improved bytes_extend() to avoid making a full copy of the temporary Alexandre Vassalotti <alexandre@peadrop.com> parents: 46430 diff changeset	2611 buf = PyBytes_AS_STRING(bytes_obj);
44137 825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2612
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2613 while ((item = PyIter_Next(it)) != NULL) {
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2614 if (! _getbytevalue(item, &value)) {
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2615 Py_DECREF(item);
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2616 Py_DECREF(it);
46446 0fede4d1b14b Improved bytes_extend() to avoid making a full copy of the temporary Alexandre Vassalotti <alexandre@peadrop.com> parents: 46430 diff changeset	2617 Py_DECREF(bytes_obj);
44137 825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2618 return NULL;
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2619 }
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2620 buf[len++] = value;
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2621 Py_DECREF(item);
46446 0fede4d1b14b Improved bytes_extend() to avoid making a full copy of the temporary Alexandre Vassalotti <alexandre@peadrop.com> parents: 46430 diff changeset	2622
44137 825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2623 if (len >= buf_size) {
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2624 buf_size = len + (len >> 1) + 1;
46446 0fede4d1b14b Improved bytes_extend() to avoid making a full copy of the temporary Alexandre Vassalotti <alexandre@peadrop.com> parents: 46430 diff changeset	2625 if (PyBytes_Resize((PyObject *)bytes_obj, buf_size) < 0) {
44137 825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2626 Py_DECREF(it);
46446 0fede4d1b14b Improved bytes_extend() to avoid making a full copy of the temporary Alexandre Vassalotti <alexandre@peadrop.com> parents: 46430 diff changeset	2627 Py_DECREF(bytes_obj);
0fede4d1b14b Improved bytes_extend() to avoid making a full copy of the temporary Alexandre Vassalotti <alexandre@peadrop.com> parents: 46430 diff changeset	2628 return NULL;
44137 825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2629 }
46446 0fede4d1b14b Improved bytes_extend() to avoid making a full copy of the temporary Alexandre Vassalotti <alexandre@peadrop.com> parents: 46430 diff changeset	2630 /* Recompute the `buf' pointer, since the resizing operation may
0fede4d1b14b Improved bytes_extend() to avoid making a full copy of the temporary Alexandre Vassalotti <alexandre@peadrop.com> parents: 46430 diff changeset	2631 have invalidated it. */
0fede4d1b14b Improved bytes_extend() to avoid making a full copy of the temporary Alexandre Vassalotti <alexandre@peadrop.com> parents: 46430 diff changeset	2632 buf = PyBytes_AS_STRING(bytes_obj);
44137 825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2633 }
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2634 }
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2635 Py_DECREF(it);
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2636
46446 0fede4d1b14b Improved bytes_extend() to avoid making a full copy of the temporary Alexandre Vassalotti <alexandre@peadrop.com> parents: 46430 diff changeset	2637 /* Resize down to exact size. */
0fede4d1b14b Improved bytes_extend() to avoid making a full copy of the temporary Alexandre Vassalotti <alexandre@peadrop.com> parents: 46430 diff changeset	2638 if (PyBytes_Resize((PyObject *)bytes_obj, len) < 0) {
0fede4d1b14b Improved bytes_extend() to avoid making a full copy of the temporary Alexandre Vassalotti <alexandre@peadrop.com> parents: 46430 diff changeset	2639 Py_DECREF(bytes_obj);
0fede4d1b14b Improved bytes_extend() to avoid making a full copy of the temporary Alexandre Vassalotti <alexandre@peadrop.com> parents: 46430 diff changeset	2640 return NULL;
0fede4d1b14b Improved bytes_extend() to avoid making a full copy of the temporary Alexandre Vassalotti <alexandre@peadrop.com> parents: 46430 diff changeset	2641 }
0fede4d1b14b Improved bytes_extend() to avoid making a full copy of the temporary Alexandre Vassalotti <alexandre@peadrop.com> parents: 46430 diff changeset	2642
0fede4d1b14b Improved bytes_extend() to avoid making a full copy of the temporary Alexandre Vassalotti <alexandre@peadrop.com> parents: 46430 diff changeset	2643 if (bytes_setslice(self, Py_SIZE(self), Py_SIZE(self), bytes_obj) == -1)
0fede4d1b14b Improved bytes_extend() to avoid making a full copy of the temporary Alexandre Vassalotti <alexandre@peadrop.com> parents: 46430 diff changeset	2644 return NULL;
0fede4d1b14b Improved bytes_extend() to avoid making a full copy of the temporary Alexandre Vassalotti <alexandre@peadrop.com> parents: 46430 diff changeset	2645 Py_DECREF(bytes_obj);
0fede4d1b14b Improved bytes_extend() to avoid making a full copy of the temporary Alexandre Vassalotti <alexandre@peadrop.com> parents: 46430 diff changeset	2646
0fede4d1b14b Improved bytes_extend() to avoid making a full copy of the temporary Alexandre Vassalotti <alexandre@peadrop.com> parents: 46430 diff changeset	2647 Py_RETURN_NONE;
44137 825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2648 }
825cffd6c0cd Issue #1283: Allow any iterable of integers to be passed to Alexandre Vassalotti <alexandre@peadrop.com> parents: 44099 diff changeset	2649
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2650 PyDoc_STRVAR(pop__doc__,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2651 "B.pop([index]) -> int\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2652 \n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2653 Remove and return a single item from B. If no index\n\
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2654 argument is give, will pop the last value.");
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2655 static PyObject *
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2656 bytes_pop(PyBytesObject self, PyObject args)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2657 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2658 int value;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	2659 Py_ssize_t where = -1, n = Py_SIZE(self);
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2660
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2661 if (!PyArg_ParseTuple(args, "\|n:pop", &where))
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2662 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2663
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2664 if (n == 0) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2665 PyErr_SetString(PyExc_OverflowError,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2666 "cannot pop an empty bytes");
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2667 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2668 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2669 if (where < 0)
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	2670 where += Py_SIZE(self);
86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	2671 if (where < 0 \|\| where >= Py_SIZE(self)) {
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2672 PyErr_SetString(PyExc_IndexError, "pop index out of range");
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2673 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2674 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2675
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2676 value = self->ob_bytes[where];
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2677 memmove(self->ob_bytes + where, self->ob_bytes + where + 1, n - where);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2678 if (PyBytes_Resize((PyObject *)self, n - 1) < 0)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2679 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2680
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43947 diff changeset	2681 return PyLong_FromLong(value);
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2682 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2683
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2684 PyDoc_STRVAR(remove__doc__,
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2685 "B.remove(int) -> None\n\
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2686 \n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2687 Remove the first occurance of a value in B.");
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2688 static PyObject *
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2689 bytes_remove(PyBytesObject self, PyObject arg)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2690 {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2691 int value;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	2692 Py_ssize_t where, n = Py_SIZE(self);
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2693
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2694 if (! _getbytevalue(arg, &value))
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2695 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2696
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2697 for (where = 0; where < n; where++) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2698 if (self->ob_bytes[where] == value)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2699 break;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2700 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2701 if (where == n) {
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2702 PyErr_SetString(PyExc_ValueError, "value not found in bytes");
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2703 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2704 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2705
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2706 memmove(self->ob_bytes + where, self->ob_bytes + where + 1, n - where);
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2707 if (PyBytes_Resize((PyObject *)self, n - 1) < 0)
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2708 return NULL;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2709
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2710 Py_RETURN_NONE;
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2711 }
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2712
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2713 /* XXX These two helpers could be optimized if argsize == 1 */
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2714
42893 2c02ba72714b Make some internal functions static Neal Norwitz <nnorwitz@gmail.com> parents: 42779 diff changeset	2715 static Py_ssize_t
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2716 lstrip_helper(unsigned char *myptr, Py_ssize_t mysize,
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2717 void *argptr, Py_ssize_t argsize)
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2718 {
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2719 Py_ssize_t i = 0;
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2720 while (i < mysize && memchr(argptr, myptr[i], argsize))
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2721 i++;
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2722 return i;
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2723 }
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2724
42893 2c02ba72714b Make some internal functions static Neal Norwitz <nnorwitz@gmail.com> parents: 42779 diff changeset	2725 static Py_ssize_t
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2726 rstrip_helper(unsigned char *myptr, Py_ssize_t mysize,
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2727 void *argptr, Py_ssize_t argsize)
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2728 {
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2729 Py_ssize_t i = mysize - 1;
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2730 while (i >= 0 && memchr(argptr, myptr[i], argsize))
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2731 i--;
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2732 return i + 1;
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2733 }
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2734
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2735 PyDoc_STRVAR(strip__doc__,
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2736 "B.strip([bytes]) -> bytearray\n\
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2737 \n\
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2738 Strip leading and trailing bytes contained in the argument.\n\
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2739 If the argument is omitted, strip ASCII whitespace.");
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2740 static PyObject *
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2741 bytes_strip(PyBytesObject self, PyObject args)
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2742 {
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2743 Py_ssize_t left, right, mysize, argsize;
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2744 void myptr, argptr;
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2745 PyObject *arg = Py_None;
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43321 diff changeset	2746 Py_buffer varg;
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2747 if (!PyArg_ParseTuple(args, "\|O:strip", &arg))
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2748 return NULL;
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2749 if (arg == Py_None) {
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2750 argptr = "\t\n\r\f\v ";
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2751 argsize = 6;
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2752 }
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2753 else {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2754 if (_getbuffer(arg, &varg) < 0)
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2755 return NULL;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2756 argptr = varg.buf;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2757 argsize = varg.len;
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2758 }
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2759 myptr = self->ob_bytes;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	2760 mysize = Py_SIZE(self);
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2761 left = lstrip_helper(myptr, mysize, argptr, argsize);
42499 96098abc8f8f Fix core dump in an endcase of b.strip() that I missed. Guido van Rossum <guido@python.org> parents: 42457 diff changeset	2762 if (left == mysize)
96098abc8f8f Fix core dump in an endcase of b.strip() that I missed. Guido van Rossum <guido@python.org> parents: 42457 diff changeset	2763 right = left;
96098abc8f8f Fix core dump in an endcase of b.strip() that I missed. Guido van Rossum <guido@python.org> parents: 42457 diff changeset	2764 else
96098abc8f8f Fix core dump in an endcase of b.strip() that I missed. Guido van Rossum <guido@python.org> parents: 42457 diff changeset	2765 right = rstrip_helper(myptr, mysize, argptr, argsize);
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2766 if (arg != Py_None)
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2767 PyObject_ReleaseBuffer(arg, &varg);
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2768 return PyBytes_FromStringAndSize(self->ob_bytes + left, right - left);
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2769 }
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2770
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2771 PyDoc_STRVAR(lstrip__doc__,
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2772 "B.lstrip([bytes]) -> bytearray\n\
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2773 \n\
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2774 Strip leading bytes contained in the argument.\n\
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2775 If the argument is omitted, strip leading ASCII whitespace.");
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2776 static PyObject *
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2777 bytes_lstrip(PyBytesObject self, PyObject args)
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2778 {
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2779 Py_ssize_t left, right, mysize, argsize;
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2780 void myptr, argptr;
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2781 PyObject *arg = Py_None;
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43321 diff changeset	2782 Py_buffer varg;
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2783 if (!PyArg_ParseTuple(args, "\|O:lstrip", &arg))
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2784 return NULL;
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2785 if (arg == Py_None) {
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2786 argptr = "\t\n\r\f\v ";
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2787 argsize = 6;
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2788 }
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2789 else {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2790 if (_getbuffer(arg, &varg) < 0)
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2791 return NULL;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2792 argptr = varg.buf;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2793 argsize = varg.len;
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2794 }
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2795 myptr = self->ob_bytes;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	2796 mysize = Py_SIZE(self);
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2797 left = lstrip_helper(myptr, mysize, argptr, argsize);
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2798 right = mysize;
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2799 if (arg != Py_None)
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2800 PyObject_ReleaseBuffer(arg, &varg);
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2801 return PyBytes_FromStringAndSize(self->ob_bytes + left, right - left);
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2802 }
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2803
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2804 PyDoc_STRVAR(rstrip__doc__,
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2805 "B.rstrip([bytes]) -> bytearray\n\
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2806 \n\
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2807 Strip trailing bytes contained in the argument.\n\
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2808 If the argument is omitted, strip trailing ASCII whitespace.");
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2809 static PyObject *
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2810 bytes_rstrip(PyBytesObject self, PyObject args)
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2811 {
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2812 Py_ssize_t left, right, mysize, argsize;
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2813 void myptr, argptr;
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2814 PyObject *arg = Py_None;
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43321 diff changeset	2815 Py_buffer varg;
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2816 if (!PyArg_ParseTuple(args, "\|O:rstrip", &arg))
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2817 return NULL;
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2818 if (arg == Py_None) {
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2819 argptr = "\t\n\r\f\v ";
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2820 argsize = 6;
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2821 }
282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2822 else {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2823 if (_getbuffer(arg, &varg) < 0)
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2824 return NULL;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2825 argptr = varg.buf;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2826 argsize = varg.len;
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2827 }
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2828 myptr = self->ob_bytes;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	2829 mysize = Py_SIZE(self);
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2830 left = 0;
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2831 right = rstrip_helper(myptr, mysize, argptr, argsize);
43321 282e2d0c2937 Bug # 1125 (my code). Guido van Rossum <guido@python.org> parents: 43150 diff changeset	2832 if (arg != Py_None)
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2833 PyObject_ReleaseBuffer(arg, &varg);
41450 d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2834 return PyBytes_FromStringAndSize(self->ob_bytes + left, right - left);
d1c3dd184e38 Rough and dirty job -- allow concatenation of bytes and arbitrary Guido van Rossum <guido@python.org> parents: 41448 diff changeset	2835 }
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	2836
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	2837 PyDoc_STRVAR(decode_doc,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2838 "B.decode([encoding[, errors]]) -> unicode object.\n\
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	2839 \n\
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	2840 Decodes B using the codec registered for encoding. encoding defaults\n\
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	2841 to the default encoding. errors may be given to set a different error\n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2842 handling scheme. Default is 'strict' meaning that encoding errors raise\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2843 a UnicodeDecodeError. Other possible values are 'ignore' and 'replace'\n\
44249 33ff40e6e137 typo Skip Montanaro <skip@pobox.com> parents: 44226 diff changeset	2844 as well as any other name registered with codecs.register_error that is\n\
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	2845 able to handle UnicodeDecodeErrors.");
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	2846
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	2847 static PyObject *
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	2848 bytes_decode(PyObject self, PyObject args)
41448 458c8db2e946 Clean up trailing whitespace. Guido van Rossum <guido@python.org> parents: 41426 diff changeset	2849 {
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	2850 const char *encoding = NULL;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	2851 const char *errors = NULL;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	2852
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	2853 if (!PyArg_ParseTuple(args, "\|ss:decode", &encoding, &errors))
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	2854 return NULL;
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	2855 if (encoding == NULL)
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	2856 encoding = PyUnicode_GetDefaultEncoding();
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	2857 return PyCodec_Decode(self, encoding, errors);
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	2858 }
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	2859
38115 a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	2860 PyDoc_STRVAR(alloc_doc,
a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	2861 "B.__alloc__() -> int\n\
a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	2862 \n\
a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	2863 Returns the number of bytes actually allocated.");
a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	2864
a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	2865 static PyObject *
a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	2866 bytes_alloc(PyBytesObject *self)
a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	2867 {
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43947 diff changeset	2868 return PyLong_FromSsize_t(self->ob_alloc);
38115 a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	2869 }
a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	2870
38117 57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2871 PyDoc_STRVAR(join_doc,
41664 a363cea32b9b I don't know how come bytes.join() was a class method, but that's clearly Guido van Rossum <guido@python.org> parents: 41648 diff changeset	2872 "B.join(iterable_of_bytes) -> bytes\n\
38117 57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2873 \n\
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2874 Concatenates any number of bytearray objects, with B in between each pair.");
38117 57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2875
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2876 static PyObject *
41664 a363cea32b9b I don't know how come bytes.join() was a class method, but that's clearly Guido van Rossum <guido@python.org> parents: 41648 diff changeset	2877 bytes_join(PyBytesObject self, PyObject it)
38117 57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2878 {
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2879 PyObject *seq;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	2880 Py_ssize_t mysize = Py_SIZE(self);
38117 57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2881 Py_ssize_t i;
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2882 Py_ssize_t n;
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2883 PyObject **items;
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2884 Py_ssize_t totalsize = 0;
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2885 PyObject *result;
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2886 char *dest;
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2887
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2888 seq = PySequence_Fast(it, "can only join an iterable");
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2889 if (seq == NULL)
40968 2d9d10702ec4 Remove a few stray tabs from bytesobject.c. Georg Brandl <georg@python.org> parents: 40967 diff changeset	2890 return NULL;
38117 57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2891 n = PySequence_Fast_GET_SIZE(seq);
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2892 items = PySequence_Fast_ITEMS(seq);
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2893
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2894 /* Compute the total size, and check that they are all bytes */
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2895 /* XXX Shouldn't we use _getbuffer() on these items instead? */
38117 57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2896 for (i = 0; i < n; i++) {
40968 2d9d10702ec4 Remove a few stray tabs from bytesobject.c. Georg Brandl <georg@python.org> parents: 40967 diff changeset	2897 PyObject *obj = items[i];
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2898 if (!PyBytes_Check(obj) && !PyString_Check(obj)) {
40968 2d9d10702ec4 Remove a few stray tabs from bytesobject.c. Georg Brandl <georg@python.org> parents: 40967 diff changeset	2899 PyErr_Format(PyExc_TypeError,
2d9d10702ec4 Remove a few stray tabs from bytesobject.c. Georg Brandl <georg@python.org> parents: 40967 diff changeset	2900 "can only join an iterable of bytes "
2d9d10702ec4 Remove a few stray tabs from bytesobject.c. Georg Brandl <georg@python.org> parents: 40967 diff changeset	2901 "(item %ld has type '%.100s')",
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38117 diff changeset	2902 /* XXX %ld isn't right on Win64 */
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	2903 (long)i, Py_TYPE(obj)->tp_name);
40968 2d9d10702ec4 Remove a few stray tabs from bytesobject.c. Georg Brandl <georg@python.org> parents: 40967 diff changeset	2904 goto error;
2d9d10702ec4 Remove a few stray tabs from bytesobject.c. Georg Brandl <georg@python.org> parents: 40967 diff changeset	2905 }
41664 a363cea32b9b I don't know how come bytes.join() was a class method, but that's clearly Guido van Rossum <guido@python.org> parents: 41648 diff changeset	2906 if (i > 0)
a363cea32b9b I don't know how come bytes.join() was a class method, but that's clearly Guido van Rossum <guido@python.org> parents: 41648 diff changeset	2907 totalsize += mysize;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	2908 totalsize += Py_SIZE(obj);
40968 2d9d10702ec4 Remove a few stray tabs from bytesobject.c. Georg Brandl <georg@python.org> parents: 40967 diff changeset	2909 if (totalsize < 0) {
2d9d10702ec4 Remove a few stray tabs from bytesobject.c. Georg Brandl <georg@python.org> parents: 40967 diff changeset	2910 PyErr_NoMemory();
2d9d10702ec4 Remove a few stray tabs from bytesobject.c. Georg Brandl <georg@python.org> parents: 40967 diff changeset	2911 goto error;
2d9d10702ec4 Remove a few stray tabs from bytesobject.c. Georg Brandl <georg@python.org> parents: 40967 diff changeset	2912 }
38117 57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2913 }
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2914
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2915 /* Allocate the result, and copy the bytes */
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2916 result = PyBytes_FromStringAndSize(NULL, totalsize);
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2917 if (result == NULL)
40968 2d9d10702ec4 Remove a few stray tabs from bytesobject.c. Georg Brandl <georg@python.org> parents: 40967 diff changeset	2918 goto error;
38117 57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2919 dest = PyBytes_AS_STRING(result);
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2920 for (i = 0; i < n; i++) {
40968 2d9d10702ec4 Remove a few stray tabs from bytesobject.c. Georg Brandl <georg@python.org> parents: 40967 diff changeset	2921 PyObject *obj = items[i];
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	2922 Py_ssize_t size = Py_SIZE(obj);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2923 char *buf;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2924 if (PyBytes_Check(obj))
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2925 buf = PyBytes_AS_STRING(obj);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2926 else
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2927 buf = PyString_AS_STRING(obj);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2928 if (i) {
41664 a363cea32b9b I don't know how come bytes.join() was a class method, but that's clearly Guido van Rossum <guido@python.org> parents: 41648 diff changeset	2929 memcpy(dest, self->ob_bytes, mysize);
a363cea32b9b I don't know how come bytes.join() was a class method, but that's clearly Guido van Rossum <guido@python.org> parents: 41648 diff changeset	2930 dest += mysize;
a363cea32b9b I don't know how come bytes.join() was a class method, but that's clearly Guido van Rossum <guido@python.org> parents: 41648 diff changeset	2931 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2932 memcpy(dest, buf, size);
40968 2d9d10702ec4 Remove a few stray tabs from bytesobject.c. Georg Brandl <georg@python.org> parents: 40967 diff changeset	2933 dest += size;
38117 57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2934 }
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2935
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2936 /* Done */
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2937 Py_DECREF(seq);
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2938 return result;
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2939
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2940 /* Error handling */
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2941 error:
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2942 Py_DECREF(seq);
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2943 return NULL;
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2944 }
57bd7c7d91e3 Adding bytes.join() -- a class methods that concatenates an iterable of bytes. Guido van Rossum <guido@python.org> parents: 38115 diff changeset	2945
40967 a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	2946 PyDoc_STRVAR(fromhex_doc,
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2947 "bytearray.fromhex(string) -> bytearray\n\
40967 a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	2948 \n\
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2949 Create a bytearray object from a string of hexadecimal numbers.\n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	2950 Spaces between two numbers are accepted.\n\
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	2951 Example: bytearray.fromhex('B9 01EF') -> bytearray(b'\\xb9\\x01\\xef').");
40967 a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	2952
a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	2953 static int
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	2954 hex_digit_to_int(Py_UNICODE c)
40967 a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	2955 {
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	2956 if (c >= 128)
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	2957 return -1;
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	2958 if (ISDIGIT(c))
40968 2d9d10702ec4 Remove a few stray tabs from bytesobject.c. Georg Brandl <georg@python.org> parents: 40967 diff changeset	2959 return c - '0';
2d9d10702ec4 Remove a few stray tabs from bytesobject.c. Georg Brandl <georg@python.org> parents: 40967 diff changeset	2960 else {
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	2961 if (ISUPPER(c))
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	2962 c = TOLOWER(c);
40968 2d9d10702ec4 Remove a few stray tabs from bytesobject.c. Georg Brandl <georg@python.org> parents: 40967 diff changeset	2963 if (c >= 'a' && c <= 'f')
2d9d10702ec4 Remove a few stray tabs from bytesobject.c. Georg Brandl <georg@python.org> parents: 40967 diff changeset	2964 return c - 'a' + 10;
2d9d10702ec4 Remove a few stray tabs from bytesobject.c. Georg Brandl <georg@python.org> parents: 40967 diff changeset	2965 }
2d9d10702ec4 Remove a few stray tabs from bytesobject.c. Georg Brandl <georg@python.org> parents: 40967 diff changeset	2966 return -1;
40967 a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	2967 }
a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	2968
a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	2969 static PyObject *
a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	2970 bytes_fromhex(PyObject cls, PyObject args)
a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	2971 {
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	2972 PyObject newbytes, hexobj;
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	2973 char *buf;
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	2974 Py_UNICODE *hex;
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	2975 Py_ssize_t hexlen, byteslen, i, j;
40967 a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	2976 int top, bot;
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	2977
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	2978 if (!PyArg_ParseTuple(args, "U:fromhex", &hexobj))
40967 a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	2979 return NULL;
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	2980 assert(PyUnicode_Check(hexobj));
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	2981 hexlen = PyUnicode_GET_SIZE(hexobj);
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	2982 hex = PyUnicode_AS_UNICODE(hexobj);
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	2983 byteslen = hexlen/2; /* This overestimates if there are spaces */
40967 a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	2984 newbytes = PyBytes_FromStringAndSize(NULL, byteslen);
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	2985 if (!newbytes)
40967 a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	2986 return NULL;
a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	2987 buf = PyBytes_AS_STRING(newbytes);
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	2988 for (i = j = 0; i < hexlen; i += 2) {
40967 a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	2989 /* skip over spaces in the input */
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	2990 while (hex[i] == ' ')
40967 a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	2991 i++;
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	2992 if (i >= hexlen)
40967 a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	2993 break;
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	2994 top = hex_digit_to_int(hex[i]);
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	2995 bot = hex_digit_to_int(hex[i+1]);
40967 a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	2996 if (top == -1 \|\| bot == -1) {
a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	2997 PyErr_Format(PyExc_ValueError,
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	2998 "non-hexadecimal number found in "
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	2999 "fromhex() arg at position %zd", i);
40967 a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	3000 goto error;
a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	3001 }
a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	3002 buf[j++] = (top << 4) + bot;
a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	3003 }
a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	3004 if (PyBytes_Resize(newbytes, j) < 0)
a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	3005 goto error;
a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	3006 return newbytes;
a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	3007
a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	3008 error:
a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	3009 Py_DECREF(newbytes);
a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	3010 return NULL;
a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	3011 }
a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	3012
41426 4561f6da3b7d Real pickling for bytes. Guido van Rossum <guido@python.org> parents: 41412 diff changeset	3013 PyDoc_STRVAR(reduce_doc, "Return state information for pickling.");
4561f6da3b7d Real pickling for bytes. Guido van Rossum <guido@python.org> parents: 41412 diff changeset	3014
4561f6da3b7d Real pickling for bytes. Guido van Rossum <guido@python.org> parents: 41412 diff changeset	3015 static PyObject *
4561f6da3b7d Real pickling for bytes. Guido van Rossum <guido@python.org> parents: 41412 diff changeset	3016 bytes_reduce(PyBytesObject *self)
4561f6da3b7d Real pickling for bytes. Guido van Rossum <guido@python.org> parents: 41412 diff changeset	3017 {
43757 2ff0e81e68fc Patch 1171 by mfenniak -- allow subclassing of bytes. Guido van Rossum <guido@python.org> parents: 43693 diff changeset	3018 PyObject latin1, dict;
42457 080f2aa18015 Change PyUnicode_FromString[AndSize] to expect UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 42335 diff changeset	3019 if (self->ob_bytes)
42975 71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	3020 latin1 = PyUnicode_DecodeLatin1(self->ob_bytes,
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	3021 Py_SIZE(self), NULL);
42457 080f2aa18015 Change PyUnicode_FromString[AndSize] to expect UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 42335 diff changeset	3022 else
42975 71cd5598b74d Commit strict str/bytes distinction. Guido van Rossum <guido@python.org> parents: 42893 diff changeset	3023 latin1 = PyUnicode_FromString("");
43757 2ff0e81e68fc Patch 1171 by mfenniak -- allow subclassing of bytes. Guido van Rossum <guido@python.org> parents: 43693 diff changeset	3024
2ff0e81e68fc Patch 1171 by mfenniak -- allow subclassing of bytes. Guido van Rossum <guido@python.org> parents: 43693 diff changeset	3025 dict = PyObject_GetAttrString((PyObject *)self, "__dict__");
2ff0e81e68fc Patch 1171 by mfenniak -- allow subclassing of bytes. Guido van Rossum <guido@python.org> parents: 43693 diff changeset	3026 if (dict == NULL) {
2ff0e81e68fc Patch 1171 by mfenniak -- allow subclassing of bytes. Guido van Rossum <guido@python.org> parents: 43693 diff changeset	3027 PyErr_Clear();
2ff0e81e68fc Patch 1171 by mfenniak -- allow subclassing of bytes. Guido van Rossum <guido@python.org> parents: 43693 diff changeset	3028 dict = Py_None;
2ff0e81e68fc Patch 1171 by mfenniak -- allow subclassing of bytes. Guido van Rossum <guido@python.org> parents: 43693 diff changeset	3029 Py_INCREF(dict);
2ff0e81e68fc Patch 1171 by mfenniak -- allow subclassing of bytes. Guido van Rossum <guido@python.org> parents: 43693 diff changeset	3030 }
2ff0e81e68fc Patch 1171 by mfenniak -- allow subclassing of bytes. Guido van Rossum <guido@python.org> parents: 43693 diff changeset	3031
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44249 diff changeset	3032 return Py_BuildValue("(O(Ns)N)", Py_TYPE(self), latin1, "latin-1", dict);
41426 4561f6da3b7d Real pickling for bytes. Guido van Rossum <guido@python.org> parents: 41412 diff changeset	3033 }
4561f6da3b7d Real pickling for bytes. Guido van Rossum <guido@python.org> parents: 41412 diff changeset	3034
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	3035 static PySequenceMethods bytes_as_sequence = {
40967 a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	3036 (lenfunc)bytes_length, /* sq_length */
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	3037 (binaryfunc)PyBytes_Concat, /* sq_concat */
40967 a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	3038 (ssizeargfunc)bytes_repeat, /* sq_repeat */
a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	3039 (ssizeargfunc)bytes_getitem, /* sq_item */
a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	3040 0, /* sq_slice */
a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	3041 (ssizeobjargproc)bytes_setitem, /* sq_ass_item */
a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	3042 0, /* sq_ass_slice */
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3043 (objobjproc)bytes_contains, /* sq_contains */
40967 a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	3044 (binaryfunc)bytes_iconcat, /* sq_inplace_concat */
a9e6c73e0fa5 Implement bytes.fromhex(), with tests. Georg Brandl <georg@python.org> parents: 40898 diff changeset	3045 (ssizeargfunc)bytes_irepeat, /* sq_inplace_repeat */
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	3046 };
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	3047
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	3048 static PyMappingMethods bytes_as_mapping = {
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3049 (lenfunc)bytes_length,
40472 9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	3050 (binaryfunc)bytes_subscript,
9548ca0e6560 Implement extended slicing in bytes objects. Thomas Wouters <thomas@python.org> parents: 39643 diff changeset	3051 (objobjargproc)bytes_ass_subscript,
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	3052 };
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	3053
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	3054 static PyBufferProcs bytes_as_buffer = {
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: 42499 diff changeset	3055 (getbufferproc)bytes_getbuffer,
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: 42499 diff changeset	3056 (releasebufferproc)bytes_releasebuffer,
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	3057 };
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	3058
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	3059 static PyMethodDef
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	3060 bytes_methods[] = {
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3061 {"__alloc__", (PyCFunction)bytes_alloc, METH_NOARGS, alloc_doc},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3062 {"__reduce__", (PyCFunction)bytes_reduce, METH_NOARGS, reduce_doc},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3063 {"append", (PyCFunction)bytes_append, METH_O, append__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3064 {"capitalize", (PyCFunction)stringlib_capitalize, METH_NOARGS,
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3065 _Py_capitalize__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3066 {"center", (PyCFunction)stringlib_center, METH_VARARGS, center__doc__},
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	3067 {"count", (PyCFunction)bytes_count, METH_VARARGS, count__doc__},
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3068 {"decode", (PyCFunction)bytes_decode, METH_VARARGS, decode_doc},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3069 {"endswith", (PyCFunction)bytes_endswith, METH_VARARGS, endswith__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3070 {"expandtabs", (PyCFunction)stringlib_expandtabs, METH_VARARGS,
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3071 expandtabs__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3072 {"extend", (PyCFunction)bytes_extend, METH_O, extend__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3073 {"find", (PyCFunction)bytes_find, METH_VARARGS, find__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3074 {"fromhex", (PyCFunction)bytes_fromhex, METH_VARARGS\|METH_CLASS,
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3075 fromhex_doc},
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	3076 {"index", (PyCFunction)bytes_index, METH_VARARGS, index__doc__},
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3077 {"insert", (PyCFunction)bytes_insert, METH_VARARGS, insert__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3078 {"isalnum", (PyCFunction)stringlib_isalnum, METH_NOARGS,
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3079 _Py_isalnum__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3080 {"isalpha", (PyCFunction)stringlib_isalpha, METH_NOARGS,
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3081 _Py_isalpha__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3082 {"isdigit", (PyCFunction)stringlib_isdigit, METH_NOARGS,
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3083 _Py_isdigit__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3084 {"islower", (PyCFunction)stringlib_islower, METH_NOARGS,
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3085 _Py_islower__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3086 {"isspace", (PyCFunction)stringlib_isspace, METH_NOARGS,
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3087 _Py_isspace__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3088 {"istitle", (PyCFunction)stringlib_istitle, METH_NOARGS,
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3089 _Py_istitle__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3090 {"isupper", (PyCFunction)stringlib_isupper, METH_NOARGS,
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3091 _Py_isupper__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3092 {"join", (PyCFunction)bytes_join, METH_O, join_doc},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3093 {"ljust", (PyCFunction)stringlib_ljust, METH_VARARGS, ljust__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3094 {"lower", (PyCFunction)stringlib_lower, METH_NOARGS, _Py_lower__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3095 {"lstrip", (PyCFunction)bytes_lstrip, METH_VARARGS, lstrip__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3096 {"partition", (PyCFunction)bytes_partition, METH_O, partition__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3097 {"pop", (PyCFunction)bytes_pop, METH_VARARGS, pop__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3098 {"remove", (PyCFunction)bytes_remove, METH_O, remove__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3099 {"replace", (PyCFunction)bytes_replace, METH_VARARGS, replace__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3100 {"reverse", (PyCFunction)bytes_reverse, METH_NOARGS, reverse__doc__},
40978 61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	3101 {"rfind", (PyCFunction)bytes_rfind, METH_VARARGS, rfind__doc__},
61fee1853ca8 SF patch #1669633, add methods for bytes from Pete Shinners. Neal Norwitz <nnorwitz@gmail.com> parents: 40968 diff changeset	3102 {"rindex", (PyCFunction)bytes_rindex, METH_VARARGS, rindex__doc__},
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3103 {"rjust", (PyCFunction)stringlib_rjust, METH_VARARGS, rjust__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3104 {"rpartition", (PyCFunction)bytes_rpartition, METH_O, rpartition__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3105 {"rsplit", (PyCFunction)bytes_rsplit, METH_VARARGS, rsplit__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3106 {"rstrip", (PyCFunction)bytes_rstrip, METH_VARARGS, rstrip__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3107 {"split", (PyCFunction)bytes_split, METH_VARARGS, split__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3108 {"splitlines", (PyCFunction)stringlib_splitlines, METH_VARARGS,
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3109 splitlines__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3110 {"startswith", (PyCFunction)bytes_startswith, METH_VARARGS ,
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3111 startswith__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3112 {"strip", (PyCFunction)bytes_strip, METH_VARARGS, strip__doc__},
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	3113 {"swapcase", (PyCFunction)stringlib_swapcase, METH_NOARGS,
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	3114 _Py_swapcase__doc__},
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	3115 {"title", (PyCFunction)stringlib_title, METH_NOARGS, _Py_title__doc__},
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3116 {"translate", (PyCFunction)bytes_translate, METH_VARARGS,
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3117 translate__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43689 diff changeset	3118 {"upper", (PyCFunction)stringlib_upper, METH_NOARGS, _Py_upper__doc__},
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43508 diff changeset	3119 {"zfill", (PyCFunction)stringlib_zfill, METH_VARARGS, zfill__doc__},
38115 a6a1359aab84 Optimizations for bytes reallocation. Guido van Rossum <guido@python.org> parents: 38017 diff changeset	3120 {NULL}
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	3121 };
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	3122
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	3123 PyDoc_STRVAR(bytes_doc,
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	3124 "bytearray(iterable_of_ints) -> bytearray.\n\
cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	3125 bytearray(string, encoding[, errors]) -> bytearray.\n\
cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	3126 bytearray(bytes_or_bytearray) -> mutable copy of bytes_or_bytearray.\n\
cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	3127 bytearray(memory_view) -> bytearray.\n\
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	3128 \n\
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	3129 Construct an mutable bytearray object from:\n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	3130 - an iterable yielding integers in range(256)\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	3131 - a text string encoded using the specified encoding\n\
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	3132 - a bytes or a bytearray object\n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	3133 - any object implementing the buffer API.\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	3134 \n\
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	3135 bytearray(int) -> bytearray.\n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	3136 \n\
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	3137 Construct a zero-initialized bytearray of the given length.");
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	3138
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	3139
43689 64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3140 static PyObject bytes_iter(PyObject seq);
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3141
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	3142 PyTypeObject PyBytes_Type = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42319 diff changeset	3143 PyVarObject_HEAD_INIT(&PyType_Type, 0)
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	3144 "bytearray",
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	3145 sizeof(PyBytesObject),
a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	3146 0,
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3147 (destructor)bytes_dealloc, /* tp_dealloc */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3148 0, /* tp_print */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3149 0, /* tp_getattr */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3150 0, /* tp_setattr */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3151 0, /* tp_compare */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3152 (reprfunc)bytes_repr, /* tp_repr */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3153 0, /* tp_as_number */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3154 &bytes_as_sequence, /* tp_as_sequence */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3155 &bytes_as_mapping, /* tp_as_mapping */
40968 2d9d10702ec4 Remove a few stray tabs from bytesobject.c. Georg Brandl <georg@python.org> parents: 40967 diff changeset	3156 0, /* tp_hash */
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3157 0, /* tp_call */
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43757 diff changeset	3158 bytes_str, /* tp_str */
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3159 PyObject_GenericGetAttr, /* tp_getattro */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3160 0, /* tp_setattro */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3161 &bytes_as_buffer, /* tp_as_buffer */
43757 2ff0e81e68fc Patch 1171 by mfenniak -- allow subclassing of bytes. Guido van Rossum <guido@python.org> parents: 43693 diff changeset	3162 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE, /* tp_flags */
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3163 bytes_doc, /* tp_doc */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3164 0, /* tp_traverse */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3165 0, /* tp_clear */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3166 (richcmpfunc)bytes_richcompare, /* tp_richcompare */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3167 0, /* tp_weaklistoffset */
43689 64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3168 bytes_iter, /* tp_iter */
37960 e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3169 0, /* tp_iternext */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3170 bytes_methods, /* tp_methods */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3171 0, /* tp_members */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3172 0, /* tp_getset */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3173 0, /* tp_base */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3174 0, /* tp_dict */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3175 0, /* tp_descr_get */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3176 0, /* tp_descr_set */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3177 0, /* tp_dictoffset */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3178 (initproc)bytes_init, /* tp_init */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3179 PyType_GenericAlloc, /* tp_alloc */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3180 PyType_GenericNew, /* tp_new */
e0b7e34b5971 Added much functionality to the bytes type. Guido van Rossum <guido@python.org> parents: 37930 diff changeset	3181 PyObject_Del, /* tp_free */
37927 a7f3765ea464 Here is a bytes type. It's very minimal but it's a start. Guido van Rossum <guido@python.org> parents: diff changeset	3182 };
43689 64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3183
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3184 /********************* Bytes Iterator **************************/
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3185
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3186 typedef struct {
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3187 PyObject_HEAD
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3188 Py_ssize_t it_index;
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3189 PyBytesObject it_seq; / Set to NULL when iterator is exhausted */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3190 } bytesiterobject;
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3191
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3192 static void
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3193 bytesiter_dealloc(bytesiterobject *it)
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3194 {
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3195 _PyObject_GC_UNTRACK(it);
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3196 Py_XDECREF(it->it_seq);
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3197 PyObject_GC_Del(it);
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3198 }
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3199
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3200 static int
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3201 bytesiter_traverse(bytesiterobject it, visitproc visit, void arg)
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3202 {
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3203 Py_VISIT(it->it_seq);
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3204 return 0;
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3205 }
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3206
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3207 static PyObject *
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3208 bytesiter_next(bytesiterobject *it)
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3209 {
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3210 PyBytesObject *seq;
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3211 PyObject *item;
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3212
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3213 assert(it != NULL);
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3214 seq = it->it_seq;
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3215 if (seq == NULL)
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3216 return NULL;
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3217 assert(PyBytes_Check(seq));
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3218
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3219 if (it->it_index < PyBytes_GET_SIZE(seq)) {
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43947 diff changeset	3220 item = PyLong_FromLong(
43689 64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3221 (unsigned char)seq->ob_bytes[it->it_index]);
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3222 if (item != NULL)
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3223 ++it->it_index;
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3224 return item;
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3225 }
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3226
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3227 Py_DECREF(seq);
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3228 it->it_seq = NULL;
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3229 return NULL;
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3230 }
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3231
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3232 static PyObject *
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3233 bytesiter_length_hint(bytesiterobject *it)
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3234 {
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3235 Py_ssize_t len = 0;
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3236 if (it->it_seq)
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3237 len = PyBytes_GET_SIZE(it->it_seq) - it->it_index;
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43947 diff changeset	3238 return PyLong_FromSsize_t(len);
43689 64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3239 }
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3240
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3241 PyDoc_STRVAR(length_hint_doc,
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3242 "Private method returning an estimate of len(list(it)).");
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3243
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3244 static PyMethodDef bytesiter_methods[] = {
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3245 {"__length_hint__", (PyCFunction)bytesiter_length_hint, METH_NOARGS,
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3246 length_hint_doc},
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3247 {NULL, NULL} /* sentinel */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3248 };
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3249
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3250 PyTypeObject PyBytesIter_Type = {
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3251 PyVarObject_HEAD_INIT(&PyType_Type, 0)
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43777 diff changeset	3252 "bytearray_iterator", /* tp_name */
43689 64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3253 sizeof(bytesiterobject), /* tp_basicsize */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3254 0, /* tp_itemsize */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3255 /* methods */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3256 (destructor)bytesiter_dealloc, /* tp_dealloc */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3257 0, /* tp_print */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3258 0, /* tp_getattr */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3259 0, /* tp_setattr */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3260 0, /* tp_compare */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3261 0, /* tp_repr */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3262 0, /* tp_as_number */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3263 0, /* tp_as_sequence */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3264 0, /* tp_as_mapping */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3265 0, /* tp_hash */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3266 0, /* tp_call */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3267 0, /* tp_str */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3268 PyObject_GenericGetAttr, /* tp_getattro */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3269 0, /* tp_setattro */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3270 0, /* tp_as_buffer */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3271 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC, /* tp_flags */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3272 0, /* tp_doc */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3273 (traverseproc)bytesiter_traverse, /* tp_traverse */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3274 0, /* tp_clear */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3275 0, /* tp_richcompare */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3276 0, /* tp_weaklistoffset */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3277 PyObject_SelfIter, /* tp_iter */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3278 (iternextfunc)bytesiter_next, /* tp_iternext */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3279 bytesiter_methods, /* tp_methods */
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3280 0,
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3281 };
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3282
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3283 static PyObject *
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3284 bytes_iter(PyObject *seq)
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3285 {
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3286 bytesiterobject *it;
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3287
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3288 if (!PyBytes_Check(seq)) {
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3289 PyErr_BadInternalCall();
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3290 return NULL;
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3291 }
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3292 it = PyObject_GC_New(bytesiterobject, &PyBytesIter_Type);
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3293 if (it == NULL)
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3294 return NULL;
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3295 it->it_index = 0;
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3296 Py_INCREF(seq);
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3297 it->it_seq = (PyBytesObject *)seq;
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3298 _PyObject_GC_TRACK(it);
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3299 return (PyObject *)it;
64ce3bf3a6a9 Patch 1335 by Christian Heimes. Guido van Rossum <guido@python.org> parents: 43687 diff changeset	3300 }

Mercurial > cpython-lru_cache-weakref

annotate Objects/bytesobject.c @ 46567:ffeecbebf3ca