[pypy-commit] pypy cpyext-from: close branch

[plan_rich]

Author: Richard Plangger <planrichi at gmail.com>
Branch: cpyext-from
Changeset: r89400:8e6bf680169d
Date: 2017-01-06 14:59 +0100
http://bitbucket.org/pypy/pypy/changeset/8e6bf680169d/

Log:	close branch

diff --git a/pypy/module/cpyext/memoryobject.py b/pypy/module/cpyext/memoryobject.py
--- a/pypy/module/cpyext/memoryobject.py
+++ b/pypy/module/cpyext/memoryobject.py
@@ -211,7 +211,7 @@
     #_dup_Py_buffer(space, view, buf)
     view.c_buf = rffi.cast(rffi.VOIDP, buf.get_raw_address())
     # the docs say that in PyMemoryView_FromBuffer (and thus FromObject)
-    # this object must be NULL
+    # this object must be NULL in Python 3.5
     view.c_obj = make_ref(space, w_obj)
 
     # XXX what about w_mview.base = w_obj (see cpython 2.7 implementation)
diff --git a/pypy/objspace/std/memoryobject.py b/pypy/objspace/std/memoryobject.py
--- a/pypy/objspace/std/memoryobject.py
+++ b/pypy/objspace/std/memoryobject.py
@@ -36,6 +36,7 @@
                 str2 = w_other.as_str()
                 return space.wrap(getattr(operator, name)(str1, str2))
 
+            import pdb; pdb.set_trace()
             try:
                 buf = space.buffer_w(w_other, space.BUF_CONTIG_RO)
             except OperationError as e: