Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge 3.3.

This commit is contained in:
Stefan Krah 2013-02-19 14:02:59 +01:00
parent aaf16b9cfb 674a42b114
commit 5e06d1d0b9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Objects/memoryobject.c
View File

@ -307,7 +307,8 @@ equiv_structure(const Py_buffer *dest, const Py_buffer *src)
if (!equiv_format(dest, src) ||
!equiv_shape(dest, src)) {
PyErr_SetString(PyExc_ValueError,
"ndarray assignment: lvalue and rvalue have different structures");
"memoryview assignment: lvalue and rvalue have different "
"structures");
return 0;
}
@ -1433,7 +1434,7 @@ memory_getbuf(PyMemoryViewObject *self, Py_buffer *view, int flags)
/* PyBUF_SIMPLE|PyBUF_FORMAT and PyBUF_WRITABLE|PyBUF_FORMAT do
not make sense. */
PyErr_Format(PyExc_BufferError,
"ndarray: cannot cast to unsigned bytes if the format flag "
"memoryview: cannot cast to unsigned bytes if the format flag "
"is present");
return -1;
}