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

Use BytesIO from io. #4757

Merged
merged 1 commit into from
Jul 22, 2015
Merged

Conversation

jenshnielsen
Copy link
Member

Fix bad merge from 8fe495a

As noted by @WeatherGod in #4605 master is failing.

That is because the merge of the six branch (#4501) changed it from

from io import BytesIO 
to

from matplotlib.externals.six import BytesIO
six.BytesIO is stringIO.stringIO in python 2

while #4603 changed it to use BytesIO all over.

I.e I think the merge in 8fe495a is wrong

Fix bad merge from 8fe495a
@WeatherGod
Copy link
Member

+1 from me when travis clears

tacaswell added a commit that referenced this pull request Jul 22, 2015
@tacaswell tacaswell merged commit 1097e3f into matplotlib:master Jul 22, 2015
@jenshnielsen jenshnielsen deleted the pdfbytesiofix branch August 20, 2015 12:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants