Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade xterm.js to 2.9.2 #2849

Merged
merged 1 commit into from Sep 20, 2017
Merged

Upgrade xterm.js to 2.9.2 #2849

merged 1 commit into from Sep 20, 2017

Conversation

@cancan101
Copy link
Contributor

@cancan101 cancan101 commented Sep 18, 2017

No description provided.

@rgbkrk
Copy link
Member

@rgbkrk rgbkrk commented Sep 18, 2017

Does this fix #2850 for you?

Loading

@takluyver takluyver added this to the 5.2 milestone Sep 19, 2017
@takluyver
Copy link
Member

@takluyver takluyver commented Sep 19, 2017

It looks like the fix for that issue is still waiting in a PR on xterm.

I've restarted one test job that failed; if it passes next time, I'm happy to merge this.

Loading

@takluyver
Copy link
Member

@takluyver takluyver commented Sep 19, 2017

@Carreau it looks like the notebook tests rely on passing a base64-encoded unicode string to IPython.display.Image(), and the new release of IPython has broken that (the test only fails on Python 3, but I suspect it will display an invalid image with Python 2).

Do you think we should change the notebook tests to not rely on that, or put back the ability to pass base64 encoded data into the class in IPython?

Loading

@rgbkrk
Copy link
Member

@rgbkrk rgbkrk commented Sep 19, 2017

Do you think we should change the notebook tests to not rely on that, or put back the ability to pass base64 encoded data into the class in IPython?

Change the notebook test

Loading

@minrk
Copy link
Member

@minrk minrk commented Sep 19, 2017

#2851 should update the tests to use bytes instead.

Loading

@minrk
Copy link
Member

@minrk minrk commented Sep 19, 2017

If there is a fix to be made on the IPython side, I think it would be to make the b64encode conditional on if the input data is bytes or unicode:

if isinstance(data, unicode):
    # already base64
    b64data = data
else:
    b64data = b2a_base64(data).decode('ascii')

Loading

@takluyver
Copy link
Member

@takluyver takluyver commented Sep 20, 2017

Reopening to rerun the tests now that #2851 is merged.

Loading

@takluyver takluyver closed this Sep 20, 2017
@takluyver takluyver reopened this Sep 20, 2017
@takluyver takluyver merged commit 39c27ac into jupyter:master Sep 20, 2017
4 checks passed
Loading
@gnestor gnestor removed this from the 5.2 milestone Oct 13, 2017
@gnestor gnestor added this to the 5.2 milestone Oct 13, 2017
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 5, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants