ttconv: Also replace carriage return with spaces. #6526

Merged
merged 1 commit into from Jun 13, 2016

Conversation

Projects
None yet
4 participants
Member

QuLogic commented Jun 1, 2016

Multi-line strings will cause issues in comments since the secondary lines will not be comments. This replacement is already done for newline characters (\n), but not carriage return (\r) which is prevalent on Windows.

I went with the simpler route of just replacing with a space instead of trying to compress \r\n because that would require shifting the entire string and would be a more involved change.

I assume that changing ttconv is alright even though it's external since I can't find an upstream and there are already comments to the effect that it has already been modified.

Fixes #5862.

@QuLogic QuLogic ttconv: Also replace carriage return with spaces.
Multi-line strings will cause issues in comments since the secondary
lines will not be comments. This replacement is already done for newline
characters (\n), but not carriage return (\r) which is prevalent on
Windows.
d49faf8
Owner

tacaswell commented Jun 3, 2016

👍 I was hoping this had a simple fix like this.

@mdboom should probably review this before it is merged.

@jenshnielsen jenshnielsen merged commit 494c4f6 into matplotlib:master Jun 13, 2016

2 of 3 checks passed

coverage/coveralls Coverage decreased (-0.002%) to 69.625%
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

mdboom removed the needs_review label Jun 13, 2016

@jenshnielsen jenshnielsen added a commit that referenced this pull request Jun 13, 2016

@jenshnielsen @jenshnielsen jenshnielsen + jenshnielsen Merge pull request #6526 from QuLogic/ttconv-carriage-return
ttconv: Also replace carriage return with spaces.
77caea0
Owner

jenshnielsen commented Jun 13, 2016

Backported to 2.x as 77caea0

QuLogic deleted the QuLogic:ttconv-carriage-return branch Jun 13, 2016

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