Extract session buffers as memoryviews

jasongrout · jasongrout · commit d4b39a336f91 · 2015-02-16T19:53:30.000Z
A bug in pyzmq forces us to have a workaround, which can be deleted when the pyzmq dependency is upgraded to fix pyzmq issue #646. Thanks to @minrk for helping work on the code and also for the bugfix in pyzmq.
diff --git a/IPython/kernel/zmq/session.py b/IPython/kernel/zmq/session.py
@@ -842,8 +842,11 @@ def deserialize(self, msg_list, content=True, copy=True):
             message['content'] = self.unpack(msg_list[4])
         else:
             message['content'] = msg_list[4]
-
-        message['buffers'] = msg_list[5:]
+        buffers = [memoryview(b) for b in msg_list[5:]]
+        if buffers and buffers[0].shape is None:
+            # force copy to workaround pyzmq #646
+            buffers = [memoryview(b.bytes) for b in msg_list[5:]]
+        message['buffers'] = buffers
         # adapt to the current version
         return adapt(message)
     
