Skip to content

Fix arrow.Arrow.interval() #466

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

Closed
dwrpayne wants to merge 3 commits into from
Closed

Fix arrow.Arrow.interval() #466

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
d8c238a
Fix arrow.Arrow.interval()
dwrpayne Oct 9, 2017
f7ff96c
Add new test for interval()
dwrpayne Oct 11, 2017
ad63085
PEP8 fixes.
dwrpayne Nov 29, 2017
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
11 changes: 6 additions & 5 deletions arrow/arrow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,11 +351,12 @@ def interval(cls, frame, start, end, interval=1, tz=None):
'''
if interval < 1:
raise ValueError("interval has to be a positive integer")

spanRange = cls.span_range(frame,start,end,tz)

bound = (len(spanRange) // interval) * interval
return [ (spanRange[i][0],spanRange[i+ interval - 1][1]) for i in range(0,bound, interval) ]
range_span = cls.span_range(frame, start, end, tz)
bound = (len(range_span) // interval) * interval
_range = [(range_span[i][0], range_span[i + interval - 1][1]) for i in range(0,bound, interval) ]
if bound < len(range_span):
_range.append((range_span[bound][0], range_span[-1][1]))
return _range

# representations

Expand Down
15 changes: 13 additions & 2 deletions tests/arrow_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,9 +1001,20 @@ def test_incorrect_input(self):
def test_correct(self):
result = arrow.Arrow.interval('hour', datetime(2013, 5, 5, 12, 30), datetime(2013, 5, 5, 17, 15),2)

assertEqual(result,[(arrow.Arrow(2013, 5, 5, 12), arrow.Arrow(2013, 5, 5, 13, 59, 59, 999999)),
assertEqual(result,[
(arrow.Arrow(2013, 5, 5, 12), arrow.Arrow(2013, 5, 5, 13, 59, 59, 999999)),
(arrow.Arrow(2013, 5, 5, 14), arrow.Arrow(2013, 5, 5, 15, 59, 59, 999999)),
(arrow.Arrow(2013, 5, 5, 16), arrow.Arrow(2013, 5, 5, 17, 59, 59, 999999))])
(arrow.Arrow(2013, 5, 5, 16), arrow.Arrow(2013, 5, 5, 17, 59, 59, 999999))
])

def test_correct2(self):
result = arrow.Arrow.interval('hour', datetime(2013, 5, 5, 12, 30), datetime(2013, 5, 5, 22, 15),4)

assertEqual(result,[
(arrow.Arrow(2013, 5, 5, 12), arrow.Arrow(2013, 5, 5, 15, 59, 59, 999999)),
(arrow.Arrow(2013, 5, 5, 16), arrow.Arrow(2013, 5, 5, 19, 59, 59, 999999)),
(arrow.Arrow(2013, 5, 5, 20), arrow.Arrow(2013, 5, 5, 22, 59, 59, 999999))
])

class ArrowSpanTests(Chai):

Expand Down