Skip to content

Extract session buffers as memoryviews#7798

Merged
minrk merged 5 commits intoipython:masterfrom
jasongrout:buffer-memoryview
Mar 20, 2015
Merged

Extract session buffers as memoryviews#7798
minrk merged 5 commits intoipython:masterfrom
jasongrout:buffer-memoryview

Conversation

@jasongrout
Copy link
Copy Markdown
Member

@jasongrout jasongrout commented Feb 16, 2015

A bug in pyzmq forces us to have a workaround, which can be deleted when the pyzmq dependency is upgraded to fix zeromq/pyzmq#646.

Thanks to @minrk for helping work on the code and also for the bugfix in pyzmq.

@jasongrout
Extract session buffers as memoryviews
d4b39a3 
A bug in pyzmq forces us to have a workaround, which can be deleted when the pyzmq dependency is upgraded to fix pyzmq issue ipython#646.

Thanks to @minrk for helping work on the code and also for the bugfix in pyzmq.
@minrk minrk added this to the 4.0 milestone Feb 16, 2015
@minrk
Copy link
Copy Markdown
Member

minrk commented Feb 16, 2015

👍 thanks, @jasongrout.

@jasongrout
Copy link
Copy Markdown
Member Author

jasongrout commented Feb 16, 2015

I feel bad about the python2 only fix in the zmqhandlers file. It makes a copy on python3 too. Do we support having branches in our code for python2/python3?

@takluyver
Copy link
Copy Markdown
Member

takluyver commented Feb 17, 2015

Test failures on Python 3.3 only, but they look real:

ERROR: IPython.html.tests.test_serialize.test_serialize_binary
----------------------------------------------------------------------

Traceback (most recent call last):
  File "/home/travis/virtualenv/python3.3.5/lib/python3.3/site-packages/nose/case.py", line 198, in runTest
    self.test(*self.arg)
  File "/home/travis/virtualenv/python3.3.5/lib/python3.3/site-packages/IPython/html/tests/test_serialize.py", line 17, in test_serialize_binary
    bmsg = serialize_binary_message(msg)
  File "/home/travis/virtualenv/python3.3.5/lib/python3.3/site-packages/IPython/html/base/zmqhandlers.py", line 56, in serialize_binary_message
    return b''.join(buffers)
TypeError: sequence item 2: expected bytes, memoryview found

@jasongrout
Copy link
Copy Markdown
Member Author

jasongrout commented Feb 17, 2015

Looks like my python 3 optimization was actually added in 3.4: https://bugs.python.org/issue15958

I'll reverse the optimization tomorrow. Thanks.

@takluyver
Copy link
Copy Markdown
Member

takluyver commented Feb 17, 2015

It's also fine, as far as I'm concerned, to have an if sys.version_info < (3, 4): check to take advantage of the optimisation when it is available.

@jasongrout
Copy link
Copy Markdown
Member Author

jasongrout commented Feb 17, 2015

@takluyver - done. let's see if it passes the tests.

@jasongrout jasongrout mentioned this pull request Feb 17, 2015
Merged
@takluyver
Copy link
Copy Markdown
Member

takluyver commented Feb 17, 2015

Tests are passing, but not merging now as this is milestoned for 4.0.

@rgbkrk
Copy link
Copy Markdown
Member

rgbkrk commented Feb 19, 2015

👍 for getting this in right after the 3.0 release.

minrk added a commit that referenced this pull request Mar 20, 2015
@minrk
Merge pull request #7798 from jasongrout/buffer-memoryview
84817ef 
Extract session buffers as memoryviews
@minrk minrk merged commit 84817ef into ipython:master Mar 20, 2015
@minrk minrk mentioned this pull request Mar 20, 2015
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

4.0

Development

Successfully merging this pull request may close these issues.

4 participants

@jasongrout @minrk @takluyver @rgbkrk