Skip to content

[fix] Updating parse_human_timedelta typing #8436

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

Merged
john-bodley merged 1 commit into from
Oct 23, 2019
Merged

[fix] Updating parse_human_timedelta typing #8436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 3 deletions superset/common/query_object.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,7 @@ def __init__(
)
self.is_timeseries = is_timeseries
self.time_range = time_range
self.time_shift = (
utils.parse_human_timedelta(time_shift) if time_shift else None
)
self.time_shift = utils.parse_human_timedelta(time_shift)
self.groupby = groupby or []

# Temporal solution for backward compatability issue
Expand Down
2 changes: 1 addition & 1 deletion superset/utils/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ def default(self, o):
return json.JSONEncoder(sort_keys=True).default(self, o)


def parse_human_timedelta(s: str) -> timedelta:
def parse_human_timedelta(s: Optional[str]) -> timedelta:
"""
Returns ``datetime.datetime`` from natural language time deltas

Expand Down
1 change: 1 addition & 0 deletions tests/utils_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ def test_parse_human_timedelta(self, mock_datetime):
self.assertEqual(parse_human_timedelta("now"), timedelta(0))
self.assertEqual(parse_human_timedelta("1 year"), timedelta(366))
self.assertEqual(parse_human_timedelta("-1 year"), timedelta(-365))
self.assertEqual(parse_human_timedelta(None), timedelta(0))

@patch("superset.utils.core.datetime")
def test_parse_past_timedelta(self, mock_datetime):
Expand Down