diff --git a/umap/management/commands/empty_trash.py b/umap/management/commands/empty_trash.py index de35ab37..791c00d1 100644 --- a/umap/management/commands/empty_trash.py +++ b/umap/management/commands/empty_trash.py @@ -1,4 +1,4 @@ -from datetime import UTC, datetime, timedelta +from datetime import datetime, timedelta from django.core.management.base import BaseCommand @@ -23,7 +23,7 @@ class Command(BaseCommand): def handle(self, *args, **options): days = options["days"] - since = datetime.now(UTC) - timedelta(days=days) + since = datetime.utcnow() - timedelta(days=days) print(f"Deleting map in trash since {since}") maps = Map.objects.filter(share_status=Map.DELETED, modified_at__lt=since) for map in maps: diff --git a/umap/tests/test_empty_trash.py b/umap/tests/test_empty_trash.py index 457b1e55..ad1d01e0 100644 --- a/umap/tests/test_empty_trash.py +++ b/umap/tests/test_empty_trash.py @@ -1,4 +1,4 @@ -from datetime import UTC, datetime, timedelta +from datetime import datetime, timedelta from unittest import mock import pytest @@ -11,13 +11,13 @@ from .base import MapFactory pytestmark = pytest.mark.django_db -def test_purge_purgatory(user): +def test_empty_trash(user): recent = MapFactory(owner=user) recent_deleted = MapFactory(owner=user) recent_deleted.move_to_trash() recent_deleted.save() with mock.patch("django.utils.timezone.now") as mocked: - mocked.return_value = datetime.now(UTC) - timedelta(days=8) + mocked.return_value = datetime.utcnow() - timedelta(days=8) old_deleted = MapFactory(owner=user) old_deleted.move_to_trash() old_deleted.save()