diff options
| -rw-r--r-- | django/utils/feedgenerator.py | 3 | ||||
| -rw-r--r-- | django/utils/timezone.py | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/django/utils/feedgenerator.py b/django/utils/feedgenerator.py index f08e89b25c..1ad1802b0f 100644 --- a/django/utils/feedgenerator.py +++ b/django/utils/feedgenerator.py @@ -172,8 +172,7 @@ class SyndicationFeed: if latest_date is None or item_date > latest_date: latest_date = item_date - # datetime.now(tz=utc) is slower, as documented in django.utils.timezone.now - return latest_date or datetime.datetime.utcnow().replace(tzinfo=utc) + return latest_date or datetime.datetime.now(utc) class Enclosure: diff --git a/django/utils/timezone.py b/django/utils/timezone.py index a87ec5fc33..fc1a10c390 100644 --- a/django/utils/timezone.py +++ b/django/utils/timezone.py @@ -190,8 +190,7 @@ def now(): Return an aware or naive datetime.datetime, depending on settings.USE_TZ. """ if settings.USE_TZ: - # timeit shows that datetime.now(tz=utc) is 24% slower - return datetime.utcnow().replace(tzinfo=utc) + return datetime.now(utc) else: return datetime.now() |