Skip to content
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.

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

Default to own .fold when calling .replace() #414

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
2 changes: 2 additions & 0 deletions pendulum/datetime.py
Original file line number Diff line number Diff line change
Expand Up @@ -1494,6 +1494,8 @@ def replace(
microsecond = self.microsecond
if tzinfo is True:
tzinfo = self.tzinfo
if fold is None:
fold = self.fold

transition_rule = pendulum.POST_TRANSITION
if fold is not None:
Expand Down
33 changes: 28 additions & 5 deletions tests/datetime/test_fluent_setters.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,18 +139,41 @@ def test_fluid_at_with_transition():
assert 0 == new.second


def test_replace_tzinfo():
d = pendulum.datetime(2016, 7, 2, 0, 41, 20)
def test_replace_tzinfo_dls_off():
Copy link
Collaborator

@sdispater sdispater Jul 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why dls here and not dst?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh right - I think I started off calling it "dls" (daylight-savings), but later saw that "dst" was a more common way to name it.

I'll rename to "dst".

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed with a fixup commit (i.e. I can squash into one commit before merge if you like, unless if you want to just squash+merge)

d = pendulum.datetime(2016, 3, 27, 0, 30) # 30 min before DLS turning on
new = d.replace(tzinfo=pendulum.timezone("Europe/Paris"))

assert_datetime(new, 2016, 3, 27, 0, 30)
assert not new.is_dst()
assert new.offset == 3600
assert new.timezone_name == "Europe/Paris"


def test_replace_tzinfo_dls_transitioning_on():
d = pendulum.datetime(2016, 3, 27, 1, 30) # In middle of turning on
new = d.replace(tzinfo=pendulum.timezone("Europe/Paris"))

assert_datetime(new, 2016, 3, 27, 1, 30)
assert not new.is_dst()
assert new.offset == 3600
assert new.timezone_name == "Europe/Paris"


def test_replace_tzinfo_dls_on():
d = pendulum.datetime(2016, 10, 30, 0, 30) # 30 min before DLS turning off
new = d.replace(tzinfo=pendulum.timezone("Europe/Paris"))

assert_datetime(new, 2016, 10, 30, 0, 30)
assert new.is_dst()
assert new.offset == 7200
assert new.timezone_name == "Europe/Paris"


def test_replace_tzinfo_dst():
d = pendulum.datetime(2013, 3, 31, 2, 30)
def test_replace_tzinfo_dls_transitioning_off():
d = pendulum.datetime(2016, 10, 30, 1, 30) # In the middle of turning off
new = d.replace(tzinfo=pendulum.timezone("Europe/Paris"))

assert_datetime(new, 2013, 3, 31, 3, 30)
assert_datetime(new, 2016, 10, 30, 1, 30)
assert new.is_dst()
assert new.offset == 7200
assert new.timezone_name == "Europe/Paris"
59 changes: 59 additions & 0 deletions tests/datetime/test_replace.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import pendulum

from ..conftest import assert_datetime


def test_replace_tzinfo_dls_off():
utc = pendulum.datetime(2016, 3, 27, 0, 30) # 30 min before DLS turning on
in_paris = utc.in_tz("Europe/Paris")

assert_datetime(in_paris, 2016, 3, 27, 1, 30, 0)

in_paris = in_paris.replace(second=1)

assert_datetime(in_paris, 2016, 3, 27, 1, 30, 1)
assert not in_paris.is_dst()
assert in_paris.offset == 3600
assert in_paris.timezone_name == "Europe/Paris"


def test_replace_tzinfo_dls_transitioning_on():
utc = pendulum.datetime(2016, 3, 27, 1, 30) # In middle of turning on
in_paris = utc.in_tz("Europe/Paris")

assert_datetime(in_paris, 2016, 3, 27, 3, 30, 0)

in_paris = in_paris.replace(second=1)

assert_datetime(in_paris, 2016, 3, 27, 3, 30, 1)
assert in_paris.is_dst()
assert in_paris.offset == 7200
assert in_paris.timezone_name == "Europe/Paris"


def test_replace_tzinfo_dls_on():
utc = pendulum.datetime(2016, 10, 30, 0, 30) # 30 min before DLS turning off
in_paris = utc.in_tz("Europe/Paris")

assert_datetime(in_paris, 2016, 10, 30, 2, 30, 0)

in_paris = in_paris.replace(second=1)

assert_datetime(in_paris, 2016, 10, 30, 2, 30, 1)
assert in_paris.is_dst()
assert in_paris.offset == 7200
assert in_paris.timezone_name == "Europe/Paris"


def test_replace_tzinfo_dls_transitioning_off():
utc = pendulum.datetime(2016, 10, 30, 1, 30) # In the middle of turning off
in_paris = utc.in_tz("Europe/Paris")

assert_datetime(in_paris, 2016, 10, 30, 2, 30, 0)

in_paris = in_paris.replace(second=1)

assert_datetime(in_paris, 2016, 10, 30, 2, 30, 1)
assert not in_paris.is_dst()
assert in_paris.offset == 3600
assert in_paris.timezone_name == "Europe/Paris"