From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 8 Feb 2009 15:07:39 +0000 (+0000)
Subject: Merged revisions 69438 via svnmerge from
X-Git-Tag: v3.0.1~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=167b85c710f58c0fc2022d53681c1454421e4ced;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 69438 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r69438 | benjamin.peterson | 2009-02-08 09:00:52 -0600 (Sun, 08 Feb 2009) | 1 line

  remove memoryview.__str__ #5182
........
---

diff --git a/Misc/NEWS b/Misc/NEWS
index c72642b08d07..7267172ba4c1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 3.0.1?
 Core and Builtins
 -----------------
 
+- Issue #5182: Removed memoryview.__str__.
+
 - Issue #1717: Removed builtin cmp() function, dropped tp_compare
   slot, the C API functions PyObject_Compare and PyUnicode_Compare and
   the type definition cmpfunc.  The tp_compare slot has been renamed
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
index 0f7d71d006aa..b19ea51a6a42 100644
--- a/Objects/memoryobject.c
+++ b/Objects/memoryobject.c
@@ -498,22 +498,6 @@ memory_repr(PyMemoryViewObject *self)
     return PyUnicode_FromFormat("<memory at %p>", self);
 }
 
-
-static PyObject *
-memory_str(PyMemoryViewObject *self)
-{
-    Py_buffer view;
-    PyObject *res;
-
-    if (PyObject_GetBuffer((PyObject *)self, &view, PyBUF_FULL) < 0)
-        return NULL;
-
-    res = PyBytes_FromStringAndSize(NULL, view.len);
-    PyBuffer_ToContiguous(PyBytes_AS_STRING(res), &view, view.len, 'C');
-    PyBuffer_Release(&view);
-    return res;
-}
-
 /* Sequence methods */
 static Py_ssize_t
 memory_length(PyMemoryViewObject *self)
@@ -812,7 +796,7 @@ PyTypeObject PyMemoryView_Type = {
     &memory_as_mapping,                       /* tp_as_mapping */
     0,                                        /* tp_hash */
     0,                                        /* tp_call */
-    (reprfunc)memory_str,                     /* tp_str */
+    0,                                        /* tp_str */
     PyObject_GenericGetAttr,                  /* tp_getattro */
     0,                                        /* tp_setattro */
     &memory_as_buffer,                        /* tp_as_buffer */