diff options
| author | 2022-02-26 14:36:53 +0100 | |
|---|---|---|
| committer | 2022-03-02 19:46:22 +0100 | |
| commit | 66061855ca2098fae7e80fa2e1abb29f810495f1 (patch) | |
| tree | 5e024c49b1c2a863e566de821667f4829561a0c7 /pydis_site/apps/api/viewsets/bot | |
| parent | Merge pull request #683 from python-discord/readme-for-project-directory (diff) | |
Fix timezone awareness warnings
Add a `warnings.warnings` clause to prevent these from being raised
again in the future, and raise a full traceback if they don't.
Diffstat (limited to 'pydis_site/apps/api/viewsets/bot')
| -rw-r--r-- | pydis_site/apps/api/viewsets/bot/infraction.py | 11 | 
1 files changed, 5 insertions, 6 deletions
diff --git a/pydis_site/apps/api/viewsets/bot/infraction.py b/pydis_site/apps/api/viewsets/bot/infraction.py index 7e7adbca..d82090aa 100644 --- a/pydis_site/apps/api/viewsets/bot/infraction.py +++ b/pydis_site/apps/api/viewsets/bot/infraction.py @@ -3,6 +3,7 @@ from datetime import datetime  from django.db import IntegrityError  from django.db.models import QuerySet  from django.http.request import HttpRequest +from django.utils import timezone  from django_filters.rest_framework import DjangoFilterBackend  from rest_framework.decorators import action  from rest_framework.exceptions import ValidationError @@ -184,20 +185,18 @@ class InfractionViewSet(          filter_expires_after = self.request.query_params.get('expires_after')          if filter_expires_after:              try: -                additional_filters['expires_at__gte'] = datetime.fromisoformat( -                    filter_expires_after -                ) +                expires_after_parsed = datetime.fromisoformat(filter_expires_after)              except ValueError:                  raise ValidationError({'expires_after': ['failed to convert to datetime']}) +            additional_filters['expires_at__gte'] = timezone.make_aware(expires_after_parsed)          filter_expires_before = self.request.query_params.get('expires_before')          if filter_expires_before:              try: -                additional_filters['expires_at__lte'] = datetime.fromisoformat( -                    filter_expires_before -                ) +                expires_before_parsed = datetime.fromisoformat(filter_expires_before)              except ValueError:                  raise ValidationError({'expires_before': ['failed to convert to datetime']}) +            additional_filters['expires_at__lte'] = timezone.make_aware(expires_before_parsed)          if 'expires_at__lte' in additional_filters and 'expires_at__gte' in additional_filters:              if additional_filters['expires_at__gte'] > additional_filters['expires_at__lte']:  |