From dfe1147e7ce0f643e86968df11e270a17df574a1 Mon Sep 17 00:00:00 2001 From: Jennifer Richards Date: Tue, 18 Oct 2022 12:25:25 -0300 Subject: [PATCH] chore: switch a few datetime_today() calls to date_today() --- ietf/doc/tests.py | 4 ++-- ietf/meeting/views.py | 4 ++-- ietf/nomcom/utils.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ietf/doc/tests.py b/ietf/doc/tests.py index 03b00d490..19e3669fb 100644 --- a/ietf/doc/tests.py +++ b/ietf/doc/tests.py @@ -58,7 +58,7 @@ from ietf.utils.mail import outbox, empty_outbox from ietf.utils.test_utils import login_testing_unauthorized, unicontent, reload_db_objects from ietf.utils.test_utils import TestCase from ietf.utils.text import normalize_text -from ietf.utils.timezone import datetime_today, DEADLINE_TZINFO, RPC_TZINFO +from ietf.utils.timezone import date_today, datetime_today, DEADLINE_TZINFO, RPC_TZINFO class SearchTests(TestCase): @@ -2232,7 +2232,7 @@ class DocumentMeetingTests(TestCase): self.other_chair = PersonFactory() self.other_group.role_set.create(name_id='chair',person=self.other_chair,email=self.other_chair.email()) - today = datetime_today() + today = date_today() cut_days = settings.MEETING_MATERIALS_DEFAULT_SUBMISSION_CORRECTION_DAYS self.past_cutoff = SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today-datetime.timedelta(days=1+cut_days)) self.past = SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today-datetime.timedelta(days=cut_days/2)) diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 0651c6877..c9e22cdf1 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -3589,7 +3589,7 @@ def upcoming_ical(request): def upcoming_json(request): '''Return Upcoming meetings in json format''' - today = datetime_today() + today = date_today() # get meetings starting 7 days ago -- we'll filter out sessions in the past further down meetings = data_for_meetings_overview(Meeting.objects.filter(date__gte=today-datetime.timedelta(days=7)).order_by('date')) @@ -3997,7 +3997,7 @@ def important_dates(request, num=None, output_format=None): base_num = int(meeting.number) user = request.user - today = datetime_today() + today = date_today() meetings = [] if meeting.show_important_dates or meeting.date < today: meetings.append(meeting) diff --git a/ietf/nomcom/utils.py b/ietf/nomcom/utils.py index 46d584355..d8eaf25e9 100644 --- a/ietf/nomcom/utils.py +++ b/ietf/nomcom/utils.py @@ -34,7 +34,7 @@ from ietf.utils.pipe import pipe from ietf.utils.mail import send_mail_text, send_mail, get_payload_text from ietf.utils.log import log from ietf.person.name import unidecode_name -from ietf.utils.timezone import date_today, datetime_from_date, datetime_today, DEADLINE_TZINFO +from ietf.utils.timezone import date_today, datetime_from_date, DEADLINE_TZINFO import debug # pyflakes:ignore @@ -636,7 +636,7 @@ def get_eligibility_date(nomcom=None, date=None): else: return datetime.date(next_nomcom_year,5,1) else: - return datetime.date(datetime_today().year,5,1) + return datetime.date(date_today().year,5,1) def previous_five_meetings(date = None): if date is None: