From 83848704f550912fe559988d6de0b5105844d75f Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Tue, 3 Feb 2015 01:49:18 +0200
Subject: Issue #22896: Fixed using _getbuffer() in recently added
 _PyBytes_Format().

---
 Objects/bytesobject.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index b2fbc92..b2bf098 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -622,14 +622,13 @@ _PyBytes_Format(PyObject *format, PyObject *args)
             int isnumok;
             PyObject *v = NULL;
             PyObject *temp = NULL;
-            Py_buffer buf;
+            Py_buffer buf = {NULL, NULL};
             char *pbuf;
             int sign;
             Py_ssize_t len;
             char formatbuf[FORMATBUFLEN];
                  /* For format{int,char}() */
 
-            buf.obj = NULL;
             fmt++;
             if (*fmt == '(') {
                 char *keystart;
@@ -790,7 +789,7 @@ _PyBytes_Format(PyObject *format, PyObject *args)
                     Py_DECREF(temp);
                     goto error;
                 }
-                if (_getbuffer(repr, &buf) < 0) {
+                if (PyObject_GetBuffer(repr, &buf, PyBUF_SIMPLE) != 0) {
                     temp = format_obj(repr);
                     if (temp == NULL) {
                         Py_DECREF(repr);
-- 
cgit v0.12