Fix scheduled reports encoding #28174
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
orangejenny
reviewed
Jul 21, 2020
| couch_user=self.user, domain=domain, scheduled_report_id=report._id | ||
| )[0] | ||
| self.assertTrue(self.user.username in response.decode('utf-8')) | ||
| self.assertTrue(self.user.username in report_text) |
There was a problem hiding this comment.
Just naively grepping, there are other places where we decode('utf-8') in tests on a response variable, mostly API calls (HQ APIs, SMS, case claim). Do you think those could point to similar issues that deserve followup? (Not in this PR.)
There was a problem hiding this comment.
Possibly. We may want to look into them.
orangejenny
reviewed
Jul 21, 2020
| @@ -878,7 +882,7 @@ def _render_report_configs(request, configs, domain, owner_id, couch_user, email | |||
|
|
|||
| # Don't send an email if none of the reports configs have started | |||
| if len(configs) == 0: | |||
| return False, False | |||
| return "", [] | |||
There was a problem hiding this comment.
Hooray for consistent return values.
orangejenny
approved these changes
Jul 21, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The first commit is the fix, and the second is cleanup to make the code easier to understand.
This is the same type of issue fixed in #28157
See also https://docs.djangoproject.com/en/3.0/releases/2.0/#removed-support-for-bytestrings-in-some-places