Skip to content

FIX str.decode in python2.6 does not take keyword arguments [backport to 1.4.x] - #3850

Merged
tacaswell merged 1 commit into
matplotlib:masterfrom
NelleV:fix_2.6
Dec 12, 2014
Merged

tacaswell merged 1 commit into
matplotlib:masterfrom
NelleV:fix_2.6

Conversation

@NelleV

@NelleV NelleV commented Nov 26, 2014

Copy link
Copy Markdown
Member

No description provided.

@tacaswell

Copy link
Copy Markdown
Member

Can you also take out the 'be lenient ...' comment from the line above?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://docs.python.org/2/library/stdtypes.html Seems to suggest that the problem is the keyword, not the error handling. I think this can be changed to x.decode('ascii', 'replace')

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tacaswell tacaswell changed the title FIX str.decode in python2.6 does not take keyword arguments FIX str.decode in python2.6 does not take keyword arguments [backport to 1.4.x] Nov 26, 2014
@NelleV

NelleV commented Nov 26, 2014

Copy link
Copy Markdown
Member Author

I'll fix that ASAP, but I've got code running with mpl, so I can't test in the next 10 to 12 hours.

@mdboom

mdboom commented Dec 1, 2014

Copy link
Copy Markdown
Member

Can we leave the "lenient" comment in. It explains why having "replace" rather than just "ascii" is important.

@tacaswell

Copy link
Copy Markdown
Member

Sorry, should have nuked the comment I left as it makes sense if the
replace was removed entirely.

On Mon, Dec 1, 2014, 10:41 Michael Droettboom notifications@github.com
wrote:

Can we leave the "lenient" comment in. It explains why having "replace"
rather than just "ascii" is important.

—
Reply to this email directly or view it on GitHub
#3850 (comment)
.

@tacaswell
tacaswell merged commit addc51e into matplotlib:master Dec 12, 2014
@tacaswell

Copy link
Copy Markdown
Member

Added 0b5aae2 which return 'replace' in a 2.6 compatible way and manually merged.

@tacaswell

Copy link
Copy Markdown
Member

cherry-picked as 5876c02

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.

3 participants