chore: replace pytz with zoneinfo #35749
Open
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
mumarkhan999
force-pushed
the
umar/remove-pytz
branch
7 times, most recently
from
c9ecb0e to
1042fd7
Compare
mumarkhan999
force-pushed
the
umar/remove-pytz
branch
6 times, most recently
from
7f83d39 to
40229f8
Compare
mumarkhan999
force-pushed
the
umar/remove-pytz
branch
3 times, most recently
from
220144e to
6f94e9a
Compare
mumarkhan999
force-pushed
the
umar/remove-pytz
branch
from
6f94e9a to
b86974e
Compare
UsamaSadiq
requested changes
Jan 16, 2025
| @@ -1740,8 +1740,8 @@ def _get_now(cls, browser_timezone): | |||
| # importing here to avoid a circular import | |||
| from lms.djangoapps.courseware.context_processor import user_timezone_locale_prefs | |||
| user_timezone_locale = user_timezone_locale_prefs(crum.get_current_request()) | |||
| user_timezone = timezone(user_timezone_locale['user_timezone'] or browser_timezone or str(UTC)) | |||
| return user_timezone.localize(datetime.now()) | |||
| user_timezone = ZoneInfo(user_timezone_locale['user_timezone'] or browser_timezone or "UTC") | |||
There was a problem hiding this comment.
Is the ZoneInfo result already localized?
| @@ -32,6 +32,6 @@ def test_logger_backend(caplog): | |||
| 'time': '2012-05-01T07:27:01.000200+00:00', | |||
| 'date': '2012-05-07' | |||
| } | |||
|
|
|||
| print('ola-- ', saved_events[0], unpacked_event) | |||
There was a problem hiding this comment.
This debug statement can be removed now.
| @@ -20,10 +19,10 @@ def default(self, obj): # lint-amnesty, pylint: disable=arguments-differ, metho | |||
| if isinstance(obj, datetime): | |||
| if obj.tzinfo is None: | |||
| # Localize to UTC naive datetime objects | |||
| obj = UTC.localize(obj) # lint-amnesty, pylint: disable=no-value-for-parameter | |||
| obj = obj.replace(tzinfo=ZoneInfo("UTC")) # lint-amnesty, pylint: disable=no-value-for-parameter | |||
| return datetime.utcfromtimestamp(int(timestamp)).replace(tzinfo=utc) | ||
| return datetime.fromtimestamp(int(timestamp), tz=ZoneInfo("UTC")) | ||
| # replacing this depreciated 1099 | ||
| # return datetime.utcfromtimestamp(int(timestamp)).replace(tzinfo=ZoneInfo("UTC")) |
There was a problem hiding this comment.
The commented line should be removed completely.
| except UnknownTimeZoneError as err: | ||
| return timezone('UTC') | ||
| return ZoneInfo(user_timezone) | ||
| except KeyError: |
There was a problem hiding this comment.
Why not use UnknownZoneInfoError here as used in some files above?
| @@ -14,6 +14,6 @@ class Migration(migrations.Migration): | |||
| migrations.AlterField( | |||
| model_name='contenttypegatingconfig', | |||
| name='enabled_as_of', | |||
| field=models.DateTimeField(blank=True, default=None, help_text='If the configuration is Enabled, then all enrollments created after this date (UTC) will be affected.', null=True, verbose_name='Enabled As Of'), | |||
| field=models.DateTimeField(blank=True, default=None, help_text='If the configuration is Enabled, then all enrollments created after this date ZoneInfo("UTC") will be affected.', null=True, verbose_name='Enabled As Of'), | |||
There was a problem hiding this comment.
No need to update migrations.
| @@ -14,6 +14,6 @@ class Migration(migrations.Migration): | |||
| migrations.AlterField( | |||
| model_name='contenttypegatingconfig', | |||
| name='enabled_as_of', | |||
| field=models.DateTimeField(blank=True, default=None, help_text='If the configuration is Enabled, then all enrollments created after this date and time (UTC) will be affected.', null=True, verbose_name='Enabled As Of'), | |||
| field=models.DateTimeField(blank=True, default=None, help_text='If the configuration is Enabled, then all enrollments created after this date and time ZoneInfo("UTC") will be affected.', null=True, verbose_name='Enabled As Of'), | |||
There was a problem hiding this comment.
No need to update migrations.
| @@ -14,6 +14,6 @@ class Migration(migrations.Migration): | |||
| migrations.AlterField( | |||
| model_name='coursedurationlimitconfig', | |||
| name='enabled_as_of', | |||
| field=models.DateField(blank=True, default=None, help_text='If the configuration is Enabled, then all enrollments created after this date (UTC) will be affected.', null=True, verbose_name='Enabled As Of'), | |||
| field=models.DateField(blank=True, default=None, help_text='If the configuration is Enabled, then all enrollments created after this date ZoneInfo("UTC") will be affected.', null=True, verbose_name='Enabled As Of'), | |||
There was a problem hiding this comment.
No need to update migrations.
| @@ -14,6 +14,6 @@ class Migration(migrations.Migration): | |||
| migrations.AlterField( | |||
| model_name='coursedurationlimitconfig', | |||
| name='enabled_as_of', | |||
| field=models.DateTimeField(blank=True, default=None, help_text='If the configuration is Enabled, then all enrollments created after this date (UTC) will be affected.', null=True, verbose_name='Enabled As Of'), | |||
| field=models.DateTimeField(blank=True, default=None, help_text='If the configuration is Enabled, then all enrollments created after this date ZoneInfo("UTC") will be affected.', null=True, verbose_name='Enabled As Of'), | |||
There was a problem hiding this comment.
No need to update migrations.
| @@ -14,6 +14,6 @@ class Migration(migrations.Migration): | |||
| migrations.AlterField( | |||
| model_name='coursedurationlimitconfig', | |||
| name='enabled_as_of', | |||
| field=models.DateTimeField(blank=True, default=None, help_text='If the configuration is Enabled, then all enrollments created after this date and time (UTC) will be affected.', null=True, verbose_name='Enabled As Of'), | |||
| field=models.DateTimeField(blank=True, default=None, help_text='If the configuration is Enabled, then all enrollments created after this date and time ZoneInfo("UTC") will be affected.', null=True, verbose_name='Enabled As Of'), | |||
There was a problem hiding this comment.
No need to update migrations.
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.
Description
The alternative of some methods and variables of pytz is not available in zoneinfo.
So currently we haven't been able to obliterate pytz. We are using them simultaneously.