use memoryview instead of buffer on 2.7

KeyserSosa · Oct 29, 2010 · 3bb1b19 · 3bb1b19
1 parent 2ca6e5a
commit 3bb1b19
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/zmq/tests/test_message.py b/zmq/tests/test_message.py
@@ -282,7 +282,7 @@ def test_memoryview(self):
         v = memoryview(s)
         m = zmq.Message(s)
         buf = m.buffer
-        s2 = bytes(buf)
+        s2 = buf.tobytes()
         self.assertEquals(s2,s)
         self.assertEquals(m.bytes,s)
 

diff --git a/zmq/utils/buffers.pxd b/zmq/utils/buffers.pxd
@@ -281,7 +281,7 @@ cdef inline object viewfromobject(object obj, int readonly):
     -------
     Buffer/View of the original object.
     """
-    if oldstyle_available():
+    if not memoryview_available():
         if readonly:
             return PyBuffer_FromObject(obj, 0, Py_END_OF_BUFFER)
         else: