From: Berker Peksag <berker.peksag@gmail.com>
Date: Fri, 15 Apr 2016 22:20:47 +0000 (+0300)
Subject: Issue #26766: Remove redundant bytearray_format() from bytearrayobject.c
X-Git-Tag: v3.6.0a1~200
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=43de36d2c7a6138a47371cbe9411d3dd8026e5a4;p=thirdparty%2FPython%2Fcpython.git

Issue #26766: Remove redundant bytearray_format() from bytearrayobject.c
---

diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 7748859611fe..de7fb1e7a558 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -279,19 +279,6 @@ PyByteArray_Concat(PyObject *a, PyObject *b)
     return (PyObject *)result;
 }
 
-static PyObject *
-bytearray_format(PyByteArrayObject *self, PyObject *args)
-{
-    if (self == NULL || !PyByteArray_Check(self)) {
-        PyErr_BadInternalCall();
-        return NULL;
-    }
-
-    return _PyBytes_FormatEx(PyByteArray_AS_STRING(self),
-                             PyByteArray_GET_SIZE(self),
-                             args, 1);
-}
-
 /* Functions stuffed into the type object */
 
 static Py_ssize_t
@@ -3014,7 +3001,7 @@ bytearray_mod(PyObject *v, PyObject *w)
 {
     if (!PyByteArray_Check(v))
         Py_RETURN_NOTIMPLEMENTED;
-    return bytearray_format((PyByteArrayObject *)v, w);
+    return _PyBytes_FormatEx(PyByteArray_AS_STRING(v), PyByteArray_GET_SIZE(v), w, 1);
 }
 
 static PyNumberMethods bytearray_as_number = {