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
23 changes: 18 additions & 5 deletions dirty_equals/_datetime.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,12 @@ def __init__(

tz = pytz.timezone(tz)

if tz is not None:
now = datetime.utcnow().replace(tzinfo=timezone.utc).astimezone(tz)
else:
now = datetime.now()
self.tz = tz

approx = self._get_now()

super().__init__(
approx=now,
approx=approx,
delta=delta,
unix_number=unix_number,
iso_string=iso_string,
Expand All @@ -179,6 +178,20 @@ def __init__(
if tz is not None:
self._repr_kwargs['tz'] = tz

def _get_now(self) -> datetime:
if self.tz is None:
return datetime.now()
else:
return datetime.utcnow().replace(tzinfo=timezone.utc).astimezone(self.tz)

def prepare(self, other: Any) -> datetime:

# update approx for every comparing, to check if other value is dirty equal
# to current moment of time
self.approx = self._get_now()

return super().prepare(other)


class IsDate(IsNumeric[date]):
"""
Expand Down
8 changes: 7 additions & 1 deletion tests/test_datetime.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from datetime import date, datetime, timedelta, timezone
from unittest.mock import Mock

import pytest
import pytz
Expand All @@ -25,7 +26,6 @@
),
pytest.param('28/01/87', IsDatetime(approx=datetime(2000, 1, 1)), False, id='string-format-different'),
pytest.param('foobar', IsDatetime(approx=datetime(2000, 1, 1)), False, id='string-format-wrong'),
pytest.param(datetime.now().isoformat(), IsNow(iso_string=True), True, id='isnow-str-true'),
pytest.param(datetime(2000, 1, 1).isoformat(), IsNow(iso_string=True), False, id='isnow-str-different'),
pytest.param([1, 2, 3], IsDatetime(approx=datetime(2000, 1, 1)), False, id='wrong-type'),
pytest.param(
Expand Down Expand Up @@ -121,6 +121,12 @@ def test_delta():
assert IsNow(delta=3600.1).delta == timedelta(seconds=3600, microseconds=100000)


def test_is_now_relative(monkeypatch):
mock = Mock(return_value=datetime(2020, 1, 1, 12, 13, 14))
monkeypatch.setattr(IsNow, '_get_now', mock)
assert IsNow() == datetime(2020, 1, 1, 12, 13, 14)


def test_tz():
new_year_london = pytz.timezone('Europe/London').localize(datetime(2000, 1, 1))

Expand Down