diff options
| author | Tim Graham <timograham@gmail.com> | 2018-06-28 09:26:41 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-06-28 11:14:26 -0400 |
| commit | 2ec151e35da93047acfeea1b79c27010f2cb8594 (patch) | |
| tree | 69a307541d8690a06789623ecae15732d8d7af68 /django/utils/feedgenerator.py | |
| parent | 8c4b94d32d229109c17e050cab1f894d56e755da (diff) | |
Fixed #29514 -- Reverted "Used datetime.timezone.utc instead of pytz.utc for better performance."
This reverts commit 27ca5ce19f5f184018a61611c1bc319113b1d107 due to a
regression.
Diffstat (limited to 'django/utils/feedgenerator.py')
| -rw-r--r-- | django/utils/feedgenerator.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/django/utils/feedgenerator.py b/django/utils/feedgenerator.py index 319a017e8c..e49f534a19 100644 --- a/django/utils/feedgenerator.py +++ b/django/utils/feedgenerator.py @@ -173,7 +173,8 @@ class SyndicationFeed: if latest_date is None or item_date > latest_date: latest_date = item_date - return latest_date or datetime.datetime.now(utc) + # datetime.now(tz=utc) is slower, as documented in django.utils.timezone.now + return latest_date or datetime.datetime.utcnow().replace(tzinfo=utc) class Enclosure: |