-
Notifications
You must be signed in to change notification settings - Fork 133
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
Upgrade to Django 2.2 #1770
Upgrade to Django 2.2 #1770
Conversation
3b7cc5b
to
8d43cec
Compare
@@ -83,6 +83,9 @@ def test_manager_can_update_xform(self): | |||
|
|||
self.assertFalse(self.xform.shared) | |||
|
|||
data.pop('enketo_preview_url') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is related to this issue here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This makes sense. Do we add the link - https://code.djangoproject.com/ticket/30024 - as a comment just above the <obj>.pop('<key>')
so that in future, we can easily know why we had to do this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I'll add a link. In case someone works on the code later on.
@@ -35,14 +35,13 @@ def get_password_reset_email(user, reset_url, | |||
"""Creates the subject and email body for password reset email.""" | |||
result = urlparse(reset_url) | |||
site_name = domain = result.hostname | |||
encoded_username = urlsafe_base64_encode( | |||
b(user.username.encode('utf-8'))).decode('utf-8') | |||
encoded_username = urlsafe_base64_encode(b(user.username.encode('utf-8'))) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changed this because urlsafe_base64_encode
now returns a string instead of a bytestring.
@@ -83,6 +83,9 @@ def test_manager_can_update_xform(self): | |||
|
|||
self.assertFalse(self.xform.shared) | |||
|
|||
data.pop('enketo_preview_url') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This makes sense. Do we add the link - https://code.djangoproject.com/ticket/30024 - as a comment just above the <obj>.pop('<key>')
so that in future, we can easily know why we had to do this?
8d43cec
to
527d0d9
Compare
Using the |
- Gdal 1.10 and 1.9 is no longer supported by Django v2.2
- The function `urlsafe_base64_encode` as of django 2.2 returns strings instead of bytestring
527d0d9
to
e3c7c36
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm!
Changes / Features implemented
Steps taken to verify this change does what is intended
Side effects of implementing this change
Closes #1769