diff options
| author | Benjamin Peterson <benjamin@python.org> | 2017-09-14 04:20:29 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-14 04:20:29 (GMT) |
| commit | a72d15c97f9837f6c9c6bd476a62175c942cc588 (patch) | |
| tree | 104b0a1b090a9743e3efcdeae924c3ac9e306f12 /Objects/bufferobject.c | |
| parent | 860839cc8e0a4a0890418f77c984955697f96828 (diff) | |
| download | cpython-a72d15c97f9837f6c9c6bd476a62175c942cc588.zip cpython-a72d15c97f9837f6c9c6bd476a62175c942cc588.tar.gz cpython-a72d15c97f9837f6c9c6bd476a62175c942cc588.tar.bz2 | |
consistently use Py_TYPE, Py_REFCNT, and correct initializer macros (#3563)
This no-op change makes 2.7 more consistent with 3.x to ease comparison and backports.
Diffstat (limited to 'Objects/bufferobject.c')
| -rw-r--r-- | Objects/bufferobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/bufferobject.c b/Objects/bufferobject.c index 65857bf..d2297f3 100644 --- a/Objects/bufferobject.c +++ b/Objects/bufferobject.c @@ -34,7 +34,7 @@ get_buf(PyBufferObject *self, void **ptr, Py_ssize_t *size, else { Py_ssize_t count, offset; readbufferproc proc = 0; - PyBufferProcs *bp = self->b_base->ob_type->tp_as_buffer; + PyBufferProcs *bp = Py_TYPE(self->b_base)->tp_as_buffer; if ((*bp->bf_getsegcount)(self->b_base, NULL) != 1) { PyErr_SetString(PyExc_TypeError, "single-segment buffer object expected"); @@ -47,7 +47,7 @@ get_buf(PyBufferObject *self, void **ptr, Py_ssize_t *size, (buffer_type == ANY_BUFFER)) proc = (readbufferproc)bp->bf_getwritebuffer; else if (buffer_type == CHAR_BUFFER) { - if (!PyType_HasFeature(self->ob_type, + if (!PyType_HasFeature(Py_TYPE(self), Py_TPFLAGS_HAVE_GETCHARBUFFER)) { PyErr_SetString(PyExc_TypeError, "Py_TPFLAGS_HAVE_GETCHARBUFFER needed"); |