Remove locking part of new buffer protocol.

diff --git a/Include/object.h b/Include/object.h
index e0f5650d588ba53e65fa5ecb27dd418ce9f74f3c..96e7d8632f229626970ff15000a41f81f0d3b4dc 100644 (file)
--- a/Include/object.h
+++ b/Include/object.h
@@ -183,7 +183,6 @@ typedef void (*releasebufferproc)(PyObject *, Py_buffer *);
 #define PyBUF_WRITABLE 0x0001
 /*  we used to include an E, backwards compatible alias  */
 #define PyBUF_WRITEABLE PyBUF_WRITABLE
-#define PyBUF_LOCK 0x0002
 #define PyBUF_FORMAT 0x0004
 #define PyBUF_ND 0x0008
 #define PyBUF_STRIDES (0x0010 | PyBUF_ND)
@@ -194,25 +193,15 @@ typedef void (*releasebufferproc)(PyObject *, Py_buffer *);
 
 #define PyBUF_CONTIG (PyBUF_ND | PyBUF_WRITABLE)
 #define PyBUF_CONTIG_RO (PyBUF_ND)
-#define PyBUF_CONTIG_LCK (PyBUF_ND | PyBUF_LOCK)
-#define PyBUF_CONTIG_XLCK (PyBUF_ND | PyBUF_LOCK | PyBUF_WRITABLE)
 
 #define PyBUF_STRIDED (PyBUF_STRIDES | PyBUF_WRITABLE)
 #define PyBUF_STRIDED_RO (PyBUF_STRIDES)
-#define PyBUF_STRIDED_LCK (PyBUF_STRIDES | PyBUF_LOCK)
-#define PyBUF_STRIDED_XLCK (PyBUF_STRIDES | PyBUF_LOCK | PyBUF_WRITABLE)
 
 #define PyBUF_RECORDS (PyBUF_STRIDES | PyBUF_WRITABLE | PyBUF_FORMAT)
 #define PyBUF_RECORDS_RO (PyBUF_STRIDES | PyBUF_FORMAT)
-#define PyBUF_RECORDS_LCK (PyBUF_STRIDES | PyBUF_LOCK | PyBUF_FORMAT)
-#define PyBUF_RECORDS_XLCK (PyBUF_STRIDES | PyBUF_LOCK | PyBUF_WRITABLE \
-                           | 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_LOCK | PyBUF_FORMAT)
-#define PyBUF_FULL_XLCK (PyBUF_INDIRECT | PyBUF_LOCK | PyBUF_WRITABLE \
-                        | PyBUF_FORMAT)
 
 
 #define PyBUF_READ  0x100

diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index 34ec9f2580c7227ee296e49f2492b2392d265a84..18851fd1f99a12e8b0ce442a25cbf52a5222a884 100644 (file)
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -2502,11 +2502,6 @@ static int CData_NewGetBuffer(PyObject *_self, Py_buffer *view, int flags)
        Py_ssize_t i;
 
        if (view == NULL) return 0;
-       if (((flags & PyBUF_LOCK) == PyBUF_LOCK)) {
-               PyErr_SetString(PyExc_BufferError,
-                               "Cannot lock this object.");
-               return -1;
-       }
 
        view->buf = self->b_ptr;
        view->len = self->b_size;

diff --git a/Objects/abstract.c b/Objects/abstract.c
index 3e6feb584873611b823fda5d4bded52303368973..aa30129e921273dc6638eec4181f0e4e407a6ad6 100644 (file)
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -685,12 +685,6 @@ PyBuffer_FillInfo(Py_buffer *view, void *buf, Py_ssize_t len,
              int readonly, int flags)
 {
        if (view == NULL) return 0;
-       if (((flags & PyBUF_LOCK) == PyBUF_LOCK) &&
-           readonly != 0) {
-               PyErr_SetString(PyExc_BufferError,
-                               "Cannot lock this object.");
-               return -1;
-       }
        if (((flags & PyBUF_WRITABLE) == PyBUF_WRITABLE) &&
            (readonly == 1)) {
                PyErr_SetString(PyExc_BufferError,