Skip to content

[Storage] Added support for timezone awareness datetime objects in FileProperties #43566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 30, 2025
+31 −25
Merged

[Storage] Added support for timezone awareness datetime objects in FileProperties #43566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4e9302c
Added support for timezone awareness datetime objects in FileProperti…
weirongw23-msft Oct 21, 2025
e0b36c9
Use replace instead of astimezone to avoid ValueError
weirongw23-msft Oct 21, 2025
a4bf8fb
Fixed test failures
weirongw23-msft Oct 23, 2025
43f41af
Transition to using generated Deserializer.deserialize_iso
weirongw23-msft Oct 27, 2025
83beea8
Removed old code
weirongw23-msft Oct 27, 2025
406b298
Fix None case
weirongw23-msft Oct 27, 2025
6e0af1c
Fixed bug
weirongw23-msft Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions sdk/storage/azure-storage-file-share/azure/storage/fileshare/_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
from azure.core.exceptions import HttpResponseError
from azure.core.paging import PageIterator

from ._generated._utils.serialization import Deserializer
from ._generated.models import AccessPolicy as GenAccessPolicy
from ._generated.models import CorsRule as GeneratedCorsRule
from ._generated.models import DirectoryItem
Expand All @@ -26,7 +27,6 @@
from ._generated.models import ShareSmbSettings as GeneratedShareSmbSettings
from ._generated.models import SmbMultichannel as GeneratedSmbMultichannel
from ._generated.models import StorageServiceProperties as GeneratedStorageServiceProperties
from ._parser import _parse_datetime_from_str
from ._shared.models import DictMixin, get_enum_value
from ._shared.response_handlers import process_storage_error, return_context_and_deserialized

Expand Down Expand Up @@ -932,9 +932,12 @@ def __init__(self, **kwargs: Any) -> None:
self.etag = kwargs.get('ETag') # type: ignore [assignment]
self.server_encrypted = kwargs.get('x-ms-server-encrypted') # type: ignore [assignment]
self.metadata = kwargs.get('metadata') # type: ignore [assignment]
self.change_time = _parse_datetime_from_str(kwargs.get('x-ms-file-change-time'))
self.creation_time = _parse_datetime_from_str(kwargs.get('x-ms-file-creation-time'))
self.last_write_time = _parse_datetime_from_str(kwargs.get('x-ms-file-last-write-time'))
self.change_time = Deserializer.deserialize_iso(kwargs.get('x-ms-file-change-time')) if (
kwargs.get('x-ms-file-change-time') is not None) else None
self.creation_time = Deserializer.deserialize_iso(kwargs.get('x-ms-file-creation-time')) if (
kwargs.get('x-ms-file-creation-time') is not None) else None
self.last_write_time = Deserializer.deserialize_iso(kwargs.get('x-ms-file-last-write-time')) if (
kwargs.get('x-ms-file-last-write-time') is not None) else None
self.last_access_time = None
self.file_attributes = kwargs.get('x-ms-file-attributes') # type: ignore [assignment]
self.permission_key = kwargs.get('x-ms-file-permission-key') # type: ignore [assignment]
Expand Down Expand Up @@ -1180,9 +1183,12 @@ def __init__(self, **kwargs: Any) -> None:
self.copy = CopyProperties(**kwargs)
self.content_settings = ContentSettings(**kwargs)
self.lease = LeaseProperties(**kwargs)
self.change_time = _parse_datetime_from_str(kwargs.get('x-ms-file-change-time'))
self.creation_time = _parse_datetime_from_str(kwargs.get('x-ms-file-creation-time'))
self.last_write_time = _parse_datetime_from_str(kwargs.get('x-ms-file-last-write-time'))
self.change_time = Deserializer.deserialize_iso(kwargs.get('x-ms-file-change-time')) if (
kwargs.get('x-ms-file-change-time') is not None) else None
self.creation_time = Deserializer.deserialize_iso(kwargs.get('x-ms-file-creation-time')) if (
kwargs.get('x-ms-file-creation-time') is not None) else None
self.last_write_time = Deserializer.deserialize_iso(kwargs.get('x-ms-file-last-write-time')) if (
kwargs.get('x-ms-file-last-write-time') is not None) else None
self.last_access_time = None
self.file_attributes = kwargs.get('x-ms-file-attributes') # type: ignore [assignment]
self.permission_key = kwargs.get('x-ms-file-permission-key') # type: ignore [assignment]
Expand Down
10 changes: 5 additions & 5 deletions sdk/storage/azure-storage-file-share/tests/test_directory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# license information.
# --------------------------------------------------------------------------
import unittest
from datetime import datetime, timedelta
from datetime import datetime, timedelta, timezone

import pytest
from azure.core.exceptions import ClientAuthenticationError, ResourceExistsError, ResourceNotFoundError
Expand Down Expand Up @@ -110,7 +110,7 @@ def test_create_directory_set_smb_properties(self, **kwargs):

directory_client = share_client.get_directory_client('dir1')
file_attributes = NTFSAttributes(read_only=True, directory=True)
file_creation_time = file_last_write_time = file_change_time = datetime(2022, 3, 10, 10, 14, 30, 500000)
file_creation_time = file_last_write_time = file_change_time = datetime(2022, 3, 10, 10, 14, 30, 500000, tzinfo=timezone.utc)

# Act
directory_client.create_directory(
Expand Down Expand Up @@ -1262,9 +1262,9 @@ def test_rename_directory_smb_properties(self, **kwargs):
source_directory = share_client.create_directory('dir1')

file_attributes = NTFSAttributes(read_only=True, directory=True)
file_creation_time = datetime(2022, 1, 26, 10, 9, 30, 500000)
file_last_write_time = datetime(2022, 1, 26, 10, 14, 30, 500000)
file_change_time = datetime(2022, 3, 7, 10, 14, 30, 500000)
file_creation_time = datetime(2022, 1, 26, 10, 9, 30, 500000, tzinfo=timezone.utc)
file_last_write_time = datetime(2022, 1, 26, 10, 14, 30, 500000, tzinfo=timezone.utc)
file_change_time = datetime(2022, 3, 7, 10, 14, 30, 500000, tzinfo=timezone.utc)

# Act
new_directory = source_directory.rename_directory(
Expand Down
10 changes: 5 additions & 5 deletions sdk/storage/azure-storage-file-share/tests/test_directory_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# --------------------------------------------------------------------------
import unittest
import asyncio
from datetime import datetime, timedelta
from datetime import datetime, timedelta, timezone

import pytest
from azure.core.exceptions import ClientAuthenticationError, ResourceExistsError, ResourceNotFoundError
Expand Down Expand Up @@ -115,7 +115,7 @@ async def test_create_directory_set_smb_properties(self, **kwargs):

directory_client = share_client.get_directory_client('dir1')
file_attributes = NTFSAttributes(read_only=True, directory=True)
file_creation_time = file_last_write_time = file_change_time = datetime(2022, 3, 10, 10, 14, 30, 500000)
file_creation_time = file_last_write_time = file_change_time = datetime(2022, 3, 10, 10, 14, 30, 500000, tzinfo=timezone.utc)

# Act
await directory_client.create_directory(
Expand Down Expand Up @@ -1362,9 +1362,9 @@ async def test_rename_directory_smb_properties(self, **kwargs):
source_directory = await share_client.create_directory('dir1')

file_attributes = NTFSAttributes(read_only=True, directory=True)
file_creation_time = datetime(2022, 1, 26, 10, 9, 30, 500000)
file_last_write_time = datetime(2022, 1, 26, 10, 14, 30, 500000)
file_change_time = datetime(2022, 3, 7, 10, 14, 30, 500000)
file_creation_time = datetime(2022, 1, 26, 10, 9, 30, 500000, tzinfo=timezone.utc)
file_last_write_time = datetime(2022, 1, 26, 10, 14, 30, 500000, tzinfo=timezone.utc)
file_change_time = datetime(2022, 3, 7, 10, 14, 30, 500000, tzinfo=timezone.utc)

# Act
new_directory = await source_directory.rename_directory(
Expand Down
8 changes: 4 additions & 4 deletions sdk/storage/azure-storage-file-share/tests/test_file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ def test_create_file_set_smb_properties(self, **kwargs):
file_client = self._get_file_client()

file_attributes = NTFSAttributes(read_only=True, archive=True)
file_creation_time = file_last_write_time = file_change_time = datetime(2022, 3, 10, 10, 14, 30, 500000)
file_creation_time = file_last_write_time = file_change_time = datetime(2022, 3, 10, 10, 14, 30, 500000, tzinfo=timezone.utc)

# Act
file_client.create_file(
Expand Down Expand Up @@ -3598,9 +3598,9 @@ def test_rename_file_smb_properties(self, **kwargs):
source_file = self._create_file('file1')

file_attributes = NTFSAttributes(read_only=True, archive=True)
file_creation_time = datetime(2022, 1, 26, 10, 9, 30, 500000)
file_last_write_time = datetime(2022, 1, 26, 10, 14, 30, 500000)
file_change_time = datetime(2022, 3, 7, 10, 14, 30, 500000)
file_creation_time = datetime(2022, 1, 26, 10, 9, 30, 500000, tzinfo=timezone.utc)
file_last_write_time = datetime(2022, 1, 26, 10, 14, 30, 500000, tzinfo=timezone.utc)
file_change_time = datetime(2022, 3, 7, 10, 14, 30, 500000, tzinfo=timezone.utc)

# Act
new_file = source_file.rename_file(
Expand Down
8 changes: 4 additions & 4 deletions sdk/storage/azure-storage-file-share/tests/test_file_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ async def test_create_file_set_smb_properties(self, **kwargs):
file_client = await self._get_file_client(storage_account_name, storage_account_key)

file_attributes = NTFSAttributes(read_only=True, archive=True)
file_creation_time = file_last_write_time = file_change_time = datetime(2022, 3, 10, 10, 14, 30, 500000)
file_creation_time = file_last_write_time = file_change_time = datetime(2022, 3, 10, 10, 14, 30, 500000, tzinfo=timezone.utc)

# Act
await file_client.create_file(
Expand Down Expand Up @@ -3711,9 +3711,9 @@ async def test_rename_file_smb_properties(self, **kwargs):
source_file = await self._create_file(storage_account_name, storage_account_key, 'file1')

file_attributes = NTFSAttributes(read_only=True, archive=True)
file_creation_time = datetime(2022, 1, 26, 10, 9, 30, 500000)
file_last_write_time = datetime(2022, 1, 26, 10, 14, 30, 500000)
file_change_time = datetime(2022, 3, 7, 10, 14, 30, 500000)
file_creation_time = datetime(2022, 1, 26, 10, 9, 30, 500000, tzinfo=timezone.utc)
file_last_write_time = datetime(2022, 1, 26, 10, 14, 30, 500000, tzinfo=timezone.utc)
file_change_time = datetime(2022, 3, 7, 10, 14, 30, 500000, tzinfo=timezone.utc)

# Act
new_file = await source_file.rename_file(
Expand Down