summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorSean Reifscheider <jafo@tummy.com>2007-09-17 17:55:36 (GMT)
committerSean Reifscheider <jafo@tummy.com>2007-09-17 17:55:36 (GMT)
commit54cf12b625397ff52e30efd9b14f0b61edfdfd9d (patch)
tree98eb3de7701e05ae46d4fa16e4c357a162e8a9fc /Include
parenta5b8e04bd572099095fbf6b32dadde637b6e6f7b (diff)
downloadcpython-54cf12b625397ff52e30efd9b14f0b61edfdfd9d.zip
cpython-54cf12b625397ff52e30efd9b14f0b61edfdfd9d.tar.gz
cpython-54cf12b625397ff52e30efd9b14f0b61edfdfd9d.tar.bz2
Fixing the spelling of "writeable" to "writable", particularly PyBUF_WRITEABLE.
Diffstat (limited to 'Include')
-rw-r--r--Include/abstract.h4
-rw-r--r--Include/memoryobject.h6
-rw-r--r--Include/object.h12
3 files changed, 12 insertions, 10 deletions
diff --git a/Include/abstract.h b/Include/abstract.h
index b8cc59c..c3c8fd1 100644
--- a/Include/abstract.h
+++ b/Include/abstract.h
@@ -524,9 +524,9 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
Py_ssize_t *buffer_len);
/*
- Takes an arbitrary object which must support the (writeable,
+ Takes an arbitrary object which must support the (writable,
single segment) buffer interface and returns a pointer to a
- writeable memory location in buffer of size buffer_len.
+ writable memory location in buffer of size buffer_len.
0 is returned on success. buffer and buffer_len are only
set in case no error occurrs. Otherwise, -1 is returned and
diff --git a/Include/memoryobject.h b/Include/memoryobject.h
index eb49c2e..1713e8f 100644
--- a/Include/memoryobject.h
+++ b/Include/memoryobject.h
@@ -33,15 +33,15 @@ PyAPI_FUNC(PyObject *) PyMemoryView_GetContiguous(PyObject *base, int buffertype
The buffertype argument can be PyBUF_READ, PyBUF_WRITE,
PyBUF_UPDATEIFCOPY to determine whether the returned buffer
- should be READONLY, WRITEABLE, or set to update the
+ should be READONLY, WRITABLE, or set to update the
original buffer if a copy must be made. If buffertype is
PyBUF_WRITE and the buffer is not contiguous an error will
be raised. In this circumstance, the user can use
- PyBUF_UPDATEIFCOPY to ensure that a a writeable temporary
+ PyBUF_UPDATEIFCOPY to ensure that a a writable temporary
contiguous buffer is returned. The contents of this
contiguous buffer will be copied back into the original
object after the memoryview object is deleted as long as
- the original object is writeable and allows setting its
+ the original object is writable and allows setting its
memory to "readonly". If this is not allowed by the
original object, then a BufferError is raised.
diff --git a/Include/object.h b/Include/object.h
index 03f4796..c4a5cba 100644
--- a/Include/object.h
+++ b/Include/object.h
@@ -162,7 +162,9 @@ typedef void (*releasebufferproc)(PyObject *, PyBuffer *);
/* Flags for getting buffers */
#define PyBUF_SIMPLE 0
#define PyBUF_CHARACTER 1
-#define PyBUF_WRITEABLE 0x0002
+#define PyBUF_WRITABLE 0x0002
+/* we used to include an E, backwards compatible alias */
+#define PyBUF_WRITEABLE PyBUF_WRITABLE
#define PyBUF_LOCKDATA 0x0004
#define PyBUF_FORMAT 0x0008
#define PyBUF_ND 0x0010
@@ -172,19 +174,19 @@ typedef void (*releasebufferproc)(PyObject *, PyBuffer *);
#define PyBUF_ANY_CONTIGUOUS (0x0100 | PyBUF_STRIDES)
#define PyBUF_INDIRECT (0x0200 | PyBUF_STRIDES)
-#define PyBUF_CONTIG (PyBUF_ND | PyBUF_WRITEABLE)
+#define PyBUF_CONTIG (PyBUF_ND | PyBUF_WRITABLE)
#define PyBUF_CONTIG_RO (PyBUF_ND)
#define PyBUF_CONTIG_LCK (PyBUF_ND | PyBUF_LOCKDATA)
-#define PyBUF_STRIDED (PyBUF_STRIDES | PyBUF_WRITEABLE)
+#define PyBUF_STRIDED (PyBUF_STRIDES | PyBUF_WRITABLE)
#define PyBUF_STRIDED_RO (PyBUF_STRIDES)
#define PyBUF_STRIDED_LCK (PyBUF_STRIDES | PyBUF_LOCKDATA)
-#define PyBUF_RECORDS (PyBUF_STRIDES | PyBUF_WRITEABLE | PyBUF_FORMAT)
+#define PyBUF_RECORDS (PyBUF_STRIDES | PyBUF_WRITABLE | PyBUF_FORMAT)
#define PyBUF_RECORDS_RO (PyBUF_STRIDES | PyBUF_FORMAT)
#define PyBUF_RECORDS_LCK (PyBUF_STRIDES | PyBUF_LOCKDATA | PyBUF_FORMAT)
-#define PyBUF_FULL (PyBUF_INDIRECT | PyBUF_WRITEABLE | PyBUF_FORMAT)
+#define PyBUF_FULL (PyBUF_INDIRECT | PyBUF_WRITABLE | PyBUF_FORMAT)
#define PyBUF_FULL_RO (PyBUF_INDIRECT | PyBUF_FORMAT)
#define PyBUF_FULL_LCK (PyBUF_INDIRECT | PyBUF_LOCKDATA | PyBUF_FORMAT)