Skip to content

Fix date omission in span_range() when exact is True #1205

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix date omission in span_range() when exact is True #1205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68634d5
Added test that exposes bug in span_range
rkendra Dec 5, 2024
3024950
Fixed span_range omitting dates when frame is 'month', exact is True,…
rkendra Dec 5, 2024
0f434cb
Added documentation
rkendra Dec 5, 2024
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
13 changes: 13 additions & 0 deletions arrow/arrow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,20 @@ def span_range(
yield r.span(frame, bounds=bounds, exact=exact)

for r in _range:
day_is_clipped = False
floor, ceil = r.span(frame, bounds=bounds, exact=exact)

# check that no dates are lost (#1185)
next = ceil.shift(microseconds=+1)
if frame == "month" and next.day < start.day:
day_is_clipped = True
if day_is_clipped and not next._is_last_day_of_month(next):
days_to_shift = (
min(start.day, calendar.monthrange(next.year, next.month)[1])
- next.day
)
ceil = ceil.shift(days=days_to_shift)

if ceil > end:
ceil = end
if bounds[1] == ")":
Expand Down
36 changes: 36 additions & 0 deletions tests/test_arrow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1185,6 +1185,42 @@ def test_month(self):
(arrow.Arrow(2013, 4, 1), arrow.Arrow(2013, 4, 30, 23, 59, 59, 999999)),
]

def test_month_exact(self):
result = list(
arrow.Arrow.span_range(
"month", datetime(2013, 1, 31), datetime(2014, 1, 31), exact=True
)
)

assert result == [
(arrow.Arrow(2013, 1, 31), arrow.Arrow(2013, 2, 27, 23, 59, 59, 999999)),
(arrow.Arrow(2013, 2, 28), arrow.Arrow(2013, 3, 30, 23, 59, 59, 999999)),
(arrow.Arrow(2013, 3, 31), arrow.Arrow(2013, 4, 29, 23, 59, 59, 999999)),
(arrow.Arrow(2013, 4, 30), arrow.Arrow(2013, 5, 30, 23, 59, 59, 999999)),
(arrow.Arrow(2013, 5, 31), arrow.Arrow(2013, 6, 29, 23, 59, 59, 999999)),
(arrow.Arrow(2013, 6, 30), arrow.Arrow(2013, 7, 30, 23, 59, 59, 999999)),
(arrow.Arrow(2013, 7, 31), arrow.Arrow(2013, 8, 30, 23, 59, 59, 999999)),
(arrow.Arrow(2013, 8, 31), arrow.Arrow(2013, 9, 29, 23, 59, 59, 999999)),
(arrow.Arrow(2013, 9, 30), arrow.Arrow(2013, 10, 30, 23, 59, 59, 999999)),
(arrow.Arrow(2013, 10, 31), arrow.Arrow(2013, 11, 29, 23, 59, 59, 999999)),
(arrow.Arrow(2013, 11, 30), arrow.Arrow(2013, 12, 30, 23, 59, 59, 999999)),
(arrow.Arrow(2013, 12, 31), arrow.Arrow(2014, 1, 30, 23, 59, 59, 999999)),
]

def test_month_exact_leap(self):
result = list(
arrow.Arrow.span_range(
"month", datetime(2012, 1, 31), datetime(2012, 5, 31), exact=True
)
)

assert result == [
(arrow.Arrow(2012, 1, 31), arrow.Arrow(2012, 2, 28, 23, 59, 59, 999999)),
(arrow.Arrow(2012, 2, 29), arrow.Arrow(2012, 3, 30, 23, 59, 59, 999999)),
(arrow.Arrow(2012, 3, 31), arrow.Arrow(2012, 4, 29, 23, 59, 59, 999999)),
(arrow.Arrow(2012, 4, 30), arrow.Arrow(2012, 5, 30, 23, 59, 59, 999999)),
]

def test_week(self):
result = list(
arrow.Arrow.span_range("week", datetime(2013, 2, 2), datetime(2013, 2, 28))
Expand Down
Loading