From 5f7f87bc0ee86ee2c334019e00b3bd48b06b2d41 Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda@uni.lu>
Date: Thu, 8 Oct 2020 15:52:04 +0200
Subject: [PATCH] fix: 2to3 removed unnecessary conversion
---
smash/web/tests/functions.py | 2 --
smash/web/tests/view/test_kit_request.py | 3 ++-
smash/web/views/kit.py | 7 +++----
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/smash/web/tests/functions.py b/smash/web/tests/functions.py
index 4e83b3e4..429dd98b 100644
--- a/smash/web/tests/functions.py
+++ b/smash/web/tests/functions.py
@@ -331,8 +331,6 @@ def create_appointment(visit=None, when=None, length=30):
def create_appointment_without_visit(when=None, length=30):
- if not is_aware(when):
- when = make_aware(when)
return Appointment.objects.create(
length=length,
location=get_test_location(),
diff --git a/smash/web/tests/view/test_kit_request.py b/smash/web/tests/view/test_kit_request.py
index 424ff15a..dde46237 100644
--- a/smash/web/tests/view/test_kit_request.py
+++ b/smash/web/tests/view/test_kit_request.py
@@ -173,8 +173,9 @@ class ViewFunctionsTests(LoggedInTestCase):
appointment.save()
AppointmentTypeLink.objects.create(
appointment=appointment, appointment_type=appointment_type)
+ start_date = get_today_midnight_date().strftime("%Y-%m-%d")
response = self.client.get(reverse('web.views.kit_requests_send_mail',
- kwargs={'start_date': str(get_today_midnight_date().strftime("%Y-%m-%d"))}))
+ kwargs={'start_date': start_date}))
self.assertEqual(response.status_code, 200)
self.assertTrue(item_name.encode('utf8') in response.content)
self.assertEqual(1, len(mail.outbox))
diff --git a/smash/web/views/kit.py b/smash/web/views/kit.py
index 280b1769..cc211e4b 100644
--- a/smash/web/views/kit.py
+++ b/smash/web/views/kit.py
@@ -36,15 +36,14 @@ def get_kit_requests(user, start_date=None, end_date=None):
start_date = get_today_midnight_date() + datetime.timedelta(days=1)
end_date = start_date + datetime.timedelta(days=days)
else:
- if isinstance(start_date, str):
- start_date = parse_datetime(start_date)
if isinstance(start_date, str):
start_date = datetime.datetime.strptime(start_date, '%Y-%m-%d')
- if (end_date is not None) and (isinstance(end_date, str)):
- end_date = parse_datetime(end_date)
if (end_date is not None) and (isinstance(end_date, str)):
end_date = datetime.datetime.strptime(end_date, '%Y-%m-%d')
+ if start_date is None:
+ raise ValueError("start_date must not be None")
+
appointment_types = AppointmentType.objects.filter(
required_equipment__disposable=True)
--
GitLab