iop
/
superset
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix] Updating parse_human_timedelta typing (#8436)

This commit is contained in:
John Bodley 2019-10-23 16:04:46 -07:00 committed by GitHub
parent 08c6b61a2e
commit 786d7706e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
superset/common/query_object.py
View File

@ -78,9 +78,7 @@ class QueryObject:
)
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

2
superset/utils/core.py
View File

@ -291,7 +291,7 @@ class DashboardEncoder(json.JSONEncoder):
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

1
tests/utils_tests.py
View File

@ -130,6 +130,7 @@ class UtilsTestCase(unittest.TestCase):
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):