Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions flagsmith/mappers.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
StreamEvent,
TraitConfig,
)
from flagsmith.utils.datetime import fromisoformat

OverrideKey = typing.Tuple[
int,
Expand Down Expand Up @@ -69,9 +70,7 @@ def map_sse_event_to_stream_event(event: sseclient.Event) -> StreamEvent:
def map_environment_document_to_environment_updated_at(
environment_document: dict[str, typing.Any],
) -> datetime:
if (
updated_at := datetime.fromisoformat(environment_document["updated_at"])
).tzinfo is None:
if (updated_at := fromisoformat(environment_document["updated_at"])).tzinfo is None:
return updated_at.replace(tzinfo=timezone.utc)
return updated_at.astimezone(tz=timezone.utc)

Expand Down
10 changes: 10 additions & 0 deletions flagsmith/utils/datetime.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import sys

if sys.version_info >= (3, 11):
from datetime import datetime

fromisoformat = datetime.fromisoformat
else:
import iso8601

fromisoformat = iso8601.parse_date
15 changes: 14 additions & 1 deletion poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ packages = [{ include = "flagsmith" }]

[tool.poetry.dependencies]
flagsmith-flag-engine = "^10.0.0"
iso8601 = { version = "^2.1.0", python = "<3.11" }
python = ">=3.9,<4"
requests = "^2.32.3"
requests-futures = "^1.0.1"
Expand Down
4 changes: 2 additions & 2 deletions tests/data/environment.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@
"enabled": true
}
],
"updated_at": "2023-07-14 16:12:00.000000",
"updated_at": "2023-07-14T16:12:00.000000Z",
"identity_overrides": [
{
"identifier": "overridden-id",
"identity_uuid": "0f21cde8-63c5-4e50-baca-87897fa6cd01",
"created_date": "2019-08-27T14:53:45.698555Z",
"updated_at": "2023-07-14 16:12:00.000000",
"updated_at": "2023-07-14T16:12:00.000000Z",
"environment_api_key": "B62qaMZNwfiqT76p38ggrQ",
"identity_features": [
{
Expand Down