Skip to content

Commit

Permalink
[Storage] Fix #27052: az storage blob delete-batch: Use utc as defa…
Browse files Browse the repository at this point in the history
…ult timezone to remove "Datetime with no tzinfo will be considered UTC." warning (#27366)
  • Loading branch information
calvinhzy committed Sep 12, 2023
1 parent f73c7e9 commit 75c9dcc
Showing 1 changed file with 8 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,12 @@ def storage_blob_delete_batch(client, source, source_container_name, pattern=Non
if_none_match=None, timeout=None, dryrun=False):
container_client = client.get_container_client(source_container_name)

from datetime import timezone
if if_modified_since and not if_modified_since.tzinfo:
if_modified_since = if_modified_since.replace(tzinfo=timezone.utc)
if if_unmodified_since and not if_unmodified_since.tzinfo:
if_unmodified_since = if_unmodified_since.replace(tzinfo=timezone.utc)

@check_precondition_success
def _delete_blob(blob_name):
delete_blob_args = {
Expand All @@ -791,13 +797,10 @@ def _delete_blob(blob_name):
source_blobs = list(collect_blob_objects(client, source_container_name, pattern))

if dryrun:
from datetime import timezone
delete_blobs = []
if_modified_since_utc = if_modified_since.replace(tzinfo=timezone.utc) if if_modified_since else None
if_unmodified_since_utc = if_unmodified_since.replace(tzinfo=timezone.utc) if if_unmodified_since else None
for blob in source_blobs:
if not if_modified_since or blob[1].last_modified >= if_modified_since_utc:
if not if_unmodified_since or blob[1].last_modified <= if_unmodified_since_utc:
if not if_modified_since or blob[1].last_modified >= if_modified_since:
if not if_unmodified_since or blob[1].last_modified <= if_unmodified_since:
delete_blobs.append(blob[0])
logger.warning('delete action: from %s', source)
logger.warning(' pattern %s', pattern)
Expand Down

0 comments on commit 75c9dcc

Please sign in to comment.