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
4 changes: 2 additions & 2 deletions src/geoip2/_internal.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Internal utilities."""

import datetime
import datetime as dt
import json
from abc import ABCMeta
from typing import Any
Expand Down Expand Up @@ -43,7 +43,7 @@ def to_dict(self) -> dict[str, Any]: # noqa: C901, PLR0912
elif isinstance(value, dict):
if value:
result[key] = value
elif isinstance(value, datetime.date):
elif isinstance(value, dt.date):
result[key] = value.isoformat()
elif value is not None and value is not False:
result[key] = value
Expand Down
6 changes: 3 additions & 3 deletions src/geoip2/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from __future__ import annotations

import datetime
import datetime as dt
import ipaddress
from abc import ABCMeta
from ipaddress import IPv4Address, IPv6Address
Expand Down Expand Up @@ -320,7 +320,7 @@ class AnonymousPlus(AnonymousIP):
network is currently part of an actively used VPN service.
"""

network_last_seen: datetime.date | None
network_last_seen: dt.date | None
"""The last day that the network was sighted in our analysis of anonymized
networks.
"""
Expand Down Expand Up @@ -360,7 +360,7 @@ def __init__(
)
self.anonymizer_confidence = anonymizer_confidence
if network_last_seen is not None:
self.network_last_seen = datetime.date.fromisoformat(network_last_seen)
self.network_last_seen = dt.date.fromisoformat(network_last_seen)
self.provider_name = provider_name


Expand Down
14 changes: 5 additions & 9 deletions src/geoip2/records.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from __future__ import annotations

import datetime
import datetime as dt
import ipaddress
from abc import ABCMeta
from ipaddress import IPv4Address, IPv6Address
Expand Down Expand Up @@ -279,7 +279,7 @@ class AnonymizerFeed(Record):
attribute is only available from the Insights end point.
"""

network_last_seen: datetime.date | None
network_last_seen: dt.date | None
"""The last day that the network was sighted in our analysis of this
anonymizer feed. This attribute is only available from the Insights end
point.
Expand All @@ -301,9 +301,7 @@ def __init__(
) -> None:
self.confidence = confidence
self.network_last_seen = (
datetime.date.fromisoformat(network_last_seen)
if network_last_seen
else None
dt.date.fromisoformat(network_last_seen) if network_last_seen else None
)
self.provider_name = provider_name

Expand All @@ -325,7 +323,7 @@ class Anonymizer(Record):
the Insights end point.
"""

network_last_seen: datetime.date | None
network_last_seen: dt.date | None
"""The last day that the network was sighted in our analysis of anonymized
networks. This attribute is only available from the Insights end point.
"""
Expand Down Expand Up @@ -402,9 +400,7 @@ def __init__(
self.is_residential_proxy = is_residential_proxy
self.is_tor_exit_node = is_tor_exit_node
self.network_last_seen = (
datetime.date.fromisoformat(network_last_seen)
if network_last_seen
else None
dt.date.fromisoformat(network_last_seen) if network_last_seen else None
)
self.provider_name = provider_name
self.residential = AnonymizerFeed(**(residential or {}))
Expand Down
4 changes: 2 additions & 2 deletions tests/database_test.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import datetime
import datetime as dt
import ipaddress
import sys
import unittest
Expand Down Expand Up @@ -101,7 +101,7 @@ def test_anonymous_plus(self) -> None:
self.assertEqual(record.is_tor_exit_node, False)
self.assertEqual(record.ip_address, ipaddress.ip_address(ip_address))
self.assertEqual(record.network, ipaddress.ip_network("1.2.0.1/32"))
self.assertEqual(record.network_last_seen, datetime.date(2025, 4, 14))
self.assertEqual(record.network_last_seen, dt.date(2025, 4, 14))
self.assertEqual(record.provider_name, "foo")

def test_anonymous_ip_all_set(self) -> None:
Expand Down
8 changes: 4 additions & 4 deletions tests/models_test.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import datetime
import datetime as dt
import ipaddress
import sys
import unittest
Expand Down Expand Up @@ -268,7 +268,7 @@ def test_insights_full(self) -> None: # noqa: PLR0915
self.assertIs(model.anonymizer.is_tor_exit_node, True)
self.assertEqual(
model.anonymizer.network_last_seen,
datetime.date(2025, 4, 14),
dt.date(2025, 4, 14),
)
self.assertEqual(model.anonymizer.provider_name, "FooBar VPN")

Expand All @@ -281,7 +281,7 @@ def test_insights_full(self) -> None: # noqa: PLR0915
self.assertEqual(model.anonymizer.residential.confidence, 82)
self.assertEqual(
model.anonymizer.residential.network_last_seen,
datetime.date(2026, 5, 11),
dt.date(2026, 5, 11),
)
self.assertEqual(model.anonymizer.residential.provider_name, "quickshift")
self.assertEqual(
Expand Down Expand Up @@ -388,7 +388,7 @@ def test_insights_anonymizer_residential_only(self) -> None:
self.assertEqual(model.anonymizer.residential.confidence, 82)
self.assertEqual(
model.anonymizer.residential.network_last_seen,
datetime.date(2026, 5, 11),
dt.date(2026, 5, 11),
)
self.assertEqual(model.anonymizer.residential.provider_name, "quickshift")
self.assertEqual(
Expand Down
38 changes: 19 additions & 19 deletions uv.lock

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

Loading