Skip to content

Use BytesIO from io. - #4757

Merged
tacaswell merged 1 commit into
matplotlib:masterfrom
jenshnielsen:pdfbytesiofix
Jul 22, 2015
Merged

Use BytesIO from io.#4757
tacaswell merged 1 commit into
matplotlib:masterfrom
jenshnielsen:pdfbytesiofix

Conversation

@jenshnielsen

@jenshnielsen jenshnielsen commented Jul 22, 2015

Copy link
Copy Markdown
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

@jenshnielsen
Use BytesIO from io.
582986b 
Fix bad merge from 8fe495a
@WeatherGod

WeatherGod commented Jul 22, 2015

Copy link
Copy Markdown
Member

+1 from me when travis clears

tacaswell added a commit that referenced this pull request Jul 22, 2015
@tacaswell
Merge pull request #4757 from jenshnielsen/pdfbytesiofix
1097e3f 
FIX: Use BytesIO from io.
@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

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jenshnielsen @WeatherGod @tacaswell