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

Force unicode literals for Python 2 compatibility of string handling. #9602

Merged

Conversation

rtibbles
Copy link
Member

@rtibbles rtibbles commented Aug 11, 2022

Summary

  • In 95609c1 we started doing string handling in the core CSV utils module
  • We had not imported unicode literals into that module
  • This seems to have caused issues with string handling in Python 2.7 where this is necessary
  • This rectifies that
  • This was not the issue ^
  • Rather the unification of output_mapper functions between the three places it was used meant that there was a conditional in the combined output mapper that was not in the original log export one.
  • This removes that conditional, and updates the demographic exclusion code for user exports to compensate.

References

Fixes #9601

Reviewer guidance

Run Kolibri in Python 2.7
Export session or summary logs
Check if resource and channel titles are present


Testing checklist

  • Contributor has fully tested the PR manually
  • If there are any front-end changes, before/after screenshots are included
  • Critical user journeys are covered by Gherkin stories
  • Critical and brittle code paths are covered by unit tests

PR process

  • PR has the correct target branch and milestone
  • PR has 'needs review' or 'work-in-progress' label
  • If PR is ready for review, a reviewer has been added. (Don't use 'Assignees')
  • If this is an important user-facing change, PR or related issue has a 'changelog' label
  • If this includes an internal dependency change, a link to the diff is provided

Reviewer checklist

  • Automated test coverage is satisfactory
  • PR is fully functional
  • PR has been tested for accessibility regressions
  • External dependency files were updated if necessary (yarn and pip)
  • Documentation is updated
  • Contributor is in AUTHORS.md

@rtibbles rtibbles added this to the Planned Patch 5 milestone Aug 11, 2022
@rtibbles rtibbles added the TODO: needs review Waiting for review label Aug 11, 2022
@radinamatic
Copy link
Member

Channel name and Content title columns are now populated correctly in the CSV logs 💯

Tested with DEB asset in Ubuntu 18.04.

Ubuntu18 (start)  Running  - Oracle VM VirtualBox_008

Copy link
Member

@radinamatic radinamatic left a comment

Choose a reason for hiding this comment

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

Importing & exporting CSV with users also works as it's supposed to do, good to go!!! 👍🏽 :shipit:

@rtibbles rtibbles merged commit 07d5e4f into learningequality:release-v0.15.x Aug 11, 2022
@rtibbles rtibbles deleted the unicode_is_the_future branch August 11, 2022 23:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
TODO: needs review Waiting for review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants