diff options
| author | Pauli Virtanen <pav@iki.fi> | 2010-02-20 18:07:43 +0000 |
|---|---|---|
| committer | Pauli Virtanen <pav@iki.fi> | 2010-02-20 18:07:43 +0000 |
| commit | cb6ff9b2cac69c99d061aeee7b9483dcf4ce7a2c (patch) | |
| tree | 5e8c4e2bd28b7e40ae3904949879ca301c22dc3b | |
| parent | a62e7412565eb0a8ff466ca6eae197f8e7649834 (diff) | |
| download | numpy-cb6ff9b2cac69c99d061aeee7b9483dcf4ce7a2c.tar.gz | |
3K: ENH: core: audit some PyString -> PyBytes conversions
| -rw-r--r-- | numpy/core/src/multiarray/arraytypes.c.src | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/core/src/multiarray/arraytypes.c.src b/numpy/core/src/multiarray/arraytypes.c.src index 88d230c4b..7fe737162 100644 --- a/numpy/core/src/multiarray/arraytypes.c.src +++ b/numpy/core/src/multiarray/arraytypes.c.src @@ -334,7 +334,7 @@ UNICODE_setitem(PyObject *op, char *ov, PyArrayObject *ap) char *buffer; #endif - if (!PyString_Check(op) && !PyUnicode_Check(op) && + if (!PyBytes_Check(op) && !PyUnicode_Check(op) && PySequence_Check(op) && PySequence_Size(op) > 0) { PyErr_SetString(PyExc_ValueError, "setting an array element with a sequence"); @@ -414,7 +414,7 @@ STRING_getitem(char *ip, PyArrayObject *ap) while (*ptr-- == '\0' && size > 0) { size--; } - return PyString_FromStringAndSize(ip,size); + return PyBytes_FromStringAndSize(ip,size); } static int @@ -424,7 +424,7 @@ STRING_setitem(PyObject *op, char *ov, PyArrayObject *ap) Py_ssize_t len; PyObject *temp = NULL; - if (!PyString_Check(op) && !PyUnicode_Check(op) + if (!PyBytes_Check(op) && !PyUnicode_Check(op) && PySequence_Check(op) && PySequence_Size(op) > 0) { PyErr_SetString(PyExc_ValueError, "setting an array element with a sequence"); |