Skip to content

Commit 88fd31f

Browse files
hakan458hakan458
andauthored
fix: DIA-1803: Stop using deprecated utcnow (#6897)
Co-authored-by: hakan458 <[email protected]>
1 parent 0a44bdc commit 88fd31f

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

label_studio/core/utils/common.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import traceback as tb
1515
import uuid
1616
from collections import defaultdict
17-
from datetime import datetime
1817
from functools import wraps
1918
from typing import Any, Callable, Generator, Iterable, Mapping, Optional
2019

@@ -41,6 +40,7 @@
4140
pre_save,
4241
)
4342
from django.db.utils import OperationalError
43+
from django.utils import timezone
4444
from django.utils.crypto import get_random_string
4545
from django.utils.module_loading import import_string
4646
from django_filters.rest_framework import DjangoFilterBackend
@@ -261,7 +261,7 @@ def datetime_to_timestamp(dt):
261261

262262

263263
def timestamp_now():
264-
return datetime_to_timestamp(datetime.utcnow())
264+
return datetime_to_timestamp(timezone.now())
265265

266266

267267
def find_first_one_to_one_related_field_by_prefix(instance, prefix):

label_studio/io_storages/azure_blob/models.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import json
44
import logging
55
import re
6-
from datetime import datetime, timedelta
6+
from datetime import timedelta
77
from typing import Union
88
from urllib.parse import urlparse
99

@@ -15,6 +15,7 @@
1515
from django.db import models
1616
from django.db.models.signals import post_save
1717
from django.dispatch import receiver
18+
from django.utils import timezone
1819
from django.utils.translation import gettext_lazy as _
1920
from io_storages.base_models import (
2021
ExportStorage,
@@ -144,7 +145,7 @@ def generate_http_url(self, url):
144145
container = r.netloc
145146
blob = r.path.lstrip('/')
146147

147-
expiry = datetime.utcnow() + timedelta(minutes=self.presign_ttl)
148+
expiry = timezone.now() + timedelta(minutes=self.presign_ttl)
148149

149150
sas_token = generate_blob_sas(
150151
account_name=self.get_account_name(),

0 commit comments

Comments
 (0)