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

BF: Replaces escaped newline chars in conditions file strings #2126

Merged
merged 1 commit into from Dec 6, 2018

Conversation

Projects
None yet
3 participants
@dvbridges
Contributor

dvbridges commented Dec 5, 2018

New line characters in strings were printed not executed when
imported from a conditions file because new line characters are escaped
when the conditions file is converted from a dataframe to a numpy record
array. This fix checks for string in record after conversion to recarray,
and replaces the excaped newline with an unescaped new line.

BF: Replaces escaped newline chars in conditions file strings
New line characters in strings were printed not executed when
imported from a conditions file because new line characters are escaped
when the conditions file is converted from a dataframe to a numpy record
array. This fix checks for string in record after conversion to recarray,
and replaces the excaped newline with an unescaped new line.
@codecov-io

This comment has been minimized.

codecov-io commented Dec 5, 2018

Codecov Report

Merging #2126 into master will decrease coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2126      +/-   ##
==========================================
- Coverage   42.95%   42.94%   -0.01%     
==========================================
  Files         215      215              
  Lines       37756    37760       +4     
  Branches     6500     6503       +3     
==========================================
- Hits        16218    16216       -2     
- Misses      19985    19989       +4     
- Partials     1553     1555       +2
Impacted Files Coverage Δ
psychopy/data/utils.py 71.78% <100%> (+0.4%) ⬆️
psychopy/visual/window.py 67.23% <0%> (-0.74%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0d918fd...810a1a8. Read the comment docs.

@peircej peircej merged commit ed6c7ea into psychopy:master Dec 6, 2018

2 checks passed

LGTM analysis: Python No alert changes
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment