diff --git a/greg/models.py b/greg/models.py index 86a539e076af624797e25ec9db929aaa5a617719..7fdf052d2e868d34b4b3dd65da69f4822ccde0fe 100644 --- a/greg/models.py +++ b/greg/models.py @@ -4,8 +4,7 @@ from dirtyfields import DirtyFieldsMixin from django.db import models from django.db.models import Lookup from django.db.models.fields import Field - -from greg.utils import utcnow +from django.utils import timezone @Field.register_lookup @@ -109,7 +108,7 @@ class Person(BaseModel): return ( self.identities.filter( verified_at__isnull=False, - verified_at__lte=utcnow(), + verified_at__lte=timezone.now(), ).count() >= 1 ) diff --git a/greg/tests/models/test_person.py b/greg/tests/models/test_person.py index 2a2891fceefe9a1c2877e3796eee5b95e3d81791..e193a9b4276e41cb4a23335c0a0496ef8960e2b8 100644 --- a/greg/tests/models/test_person.py +++ b/greg/tests/models/test_person.py @@ -2,6 +2,7 @@ from datetime import timedelta from functools import partial import pytest +from django.utils import timezone from greg.models import ( OrganizationalUnit, @@ -11,7 +12,6 @@ from greg.models import ( RoleType, Sponsor, ) -from greg.utils import utcnow role_with = partial( Role.objects.create, @@ -21,8 +21,8 @@ role_with = partial( available_in_search=True, ) -_a_year_ago = utcnow() - timedelta(days=365) -_a_year_into_future = utcnow() + timedelta(days=365) +_a_year_ago = timezone.now() - timedelta(days=365) +_a_year_into_future = timezone.now() + timedelta(days=365) @pytest.fixture diff --git a/greg/utils.py b/greg/utils.py index 5a57818d629945a230a655382dc8cc85466de86f..8fd90ff1d89d8b025c1693dc07b94b0f2ed9273c 100644 --- a/greg/utils.py +++ b/greg/utils.py @@ -1,12 +1,6 @@ -import datetime import re def camel_to_snake(s: str) -> str: """Turns `FooBar` into `foo_bar`.""" return re.sub("([A-Z])", "_\\1", s).lower().lstrip("_") - - -def utcnow() -> datetime.datetime: - """The current date and time with the timezone set to UTC.""" - return datetime.datetime.utcnow().replace(tzinfo=datetime.timezone.utc)