Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18314 from edx/youngstrom/remove_django_18_shim

Browse Source 
Remove temp django upgrade logic
This commit is contained in:
Michael Youngstrom
2018-06-06 11:09:17 -04:00
committed by GitHub
parent 1f42d1b384 26b4e30833
commit f4dc2ca000
40 changed files with 100 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
openedx/core/djangoapps/user_api/management/commands/email_opt_in_list.py
View File

@@ -246,12 +246,7 @@ class Command(BaseCommand):
user_id, username, email, full_name, course_id, is_opted_in, pref_set_datetime = row
if pref_set_datetime:
# TODO: Remove Django 1.11 upgrade shim
# SHIM: pref_set_datetime.tzinfo should always be None here after the 1.11 upgrade
# As of Django 1.9 datetimes returned from raw sql queries are no longer coerced to being tz aware
# so we correct for that here.
if pref_set_datetime.tzinfo is None or pref_set_datetime.tzinfo.utcoffset(pref_set_datetime) is None:
pref_set_datetime = timezone.make_aware(pref_set_datetime, timezone.utc)
pref_set_datetime = timezone.make_aware(pref_set_datetime, timezone.utc)
else:
pref_set_datetime = self.DEFAULT_DATETIME_STR