Notebook Python 3 fixes #417

Merged
merged 2 commits into from Jul 29, 2016

Conversation

Projects
None yet
3 participants
@patricksnape
Contributor

patricksnape commented Jul 28, 2016

  • Use next() rather than .next() which doesn't exist on Python 3.
  • Use base64 module for png backend.
Simple py3 fix -> use the next function
Use next() rather than .next() which doesn't exist on Python 3
@codecov-io

This comment has been minimized.

Show comment
Hide comment
@codecov-io

codecov-io Jul 28, 2016

Current coverage is 45.61% (diff: 25.00%)

Merging #417 into master will increase coverage by <.01%

@@             master       #417   diff @@
==========================================
  Files           256        256          
  Lines         23292      23293     +1   
  Methods           0          0          
  Messages          0          0          
  Branches       3074       3074          
==========================================
+ Hits          10623      10624     +1   
  Misses        11948      11948          
  Partials        721        721          

Powered by Codecov. Last update 39397fb...693c606

codecov-io commented Jul 28, 2016

Current coverage is 45.61% (diff: 25.00%)

Merging #417 into master will increase coverage by <.01%

@@             master       #417   diff @@
==========================================
  Files           256        256          
  Lines         23292      23293     +1   
  Methods           0          0          
  Messages          0          0          
  Branches       3074       3074          
==========================================
+ Hits          10623      10624     +1   
  Misses        11948      11948          
  Partials        721        721          

Powered by Codecov. Last update 39397fb...693c606

Fix Python 3 png backend decoding
Base64 decoding is more complicated on Python 3 due to it's
sensitvity with bytes. Thus, use the base64 module and ensure
that the output is re-encoded as ascii otherwise Python 3
outputs a 'b' prefix

@patricksnape patricksnape changed the title from Simple py3 fix -> use the next() function to Notebook Python 3 fixes Jul 28, 2016

@prabhuramachandran

This comment has been minimized.

Show comment
Hide comment
@prabhuramachandran

prabhuramachandran Jul 29, 2016

Member

Thanks for this! Merging.

Member

prabhuramachandran commented Jul 29, 2016

Thanks for this! Merging.

@prabhuramachandran prabhuramachandran merged commit 77081e2 into enthought:master Jul 29, 2016

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@patricksnape patricksnape deleted the patricksnape:notebook_py3_fix branch Jul 29, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment