Skip to content
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

Allow non-ASCII characters in .csv condition files #892

Merged
merged 1 commit into from Apr 25, 2015
Merged

Allow non-ASCII characters in .csv condition files #892

merged 1 commit into from Apr 25, 2015

Conversation

@m-macaskill
Copy link
Contributor

@m-macaskill m-macaskill commented Apr 22, 2015

Switching to pandas for reading in .csv conditions files unintentionally broke the ability to deal with non-ASCII character content. By now explicitly setting the default encoding parameter to UTF-8, we restore that ability (.xlsx files unaffected: they already deal with Unicode OK).

Switching to pandas for reading in .csv conditions files unintentionally broke the ability to deal with non-ASCII characters. By now explicitly setting the default encoding parameter as UTF-8, we restore that ability (.xlsx files unaffected: they already deal with Unicode OK).
@coveralls
Copy link

@coveralls coveralls commented Apr 22, 2015

Coverage Status

Coverage increased (+0.0%) to 50.55% when pulling c2a78ec on m-macaskill:patch-1 into c45b8b0 on psychopy:master.

peircej added a commit that referenced this pull request Apr 25, 2015
Allow non-ASCII characters in .csv condition files
@peircej peircej merged commit df3c1cb into psychopy:master Apr 25, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage increased (+0.0%) to 50.55%
Details
@m-macaskill m-macaskill deleted the m-macaskill:patch-1 branch Apr 27, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants