Skip to content

BUG: to_timedelta not properly converting some units (GH6855) #6858

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
merged 1 commit into from
Apr 10, 2014
Merged

BUG: to_timedelta not properly converting some units (GH6855) #6858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

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: 11 additions & 0 deletions pandas/tseries/tests/test_timedeltas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,17 @@ def conv(v):
expected = Series([ np.timedelta64(1,'D') ]*5)
tm.assert_series_equal(result, expected)

# validate all units
# GH 6855
for unit in ['Y','M','W','D','y','w','d']:
result = to_timedelta(np.arange(5),unit=unit)
expected = Series([ np.timedelta64(i,unit.upper()) for i in np.arange(5).tolist() ])
tm.assert_series_equal(result, expected)
for unit in ['h','m','s','ms','us','ns','H','S','MS','US','NS']:
result = to_timedelta(np.arange(5),unit=unit)
expected = Series([ np.timedelta64(i,unit.lower()) for i in np.arange(5).tolist() ])
tm.assert_series_equal(result, expected)

# these will error
self.assertRaises(ValueError, lambda : to_timedelta(['1h']))
self.assertRaises(ValueError, lambda : to_timedelta(['1m']))
Expand Down
11 changes: 11 additions & 0 deletions pandas/tseries/timedeltas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ def _convert_listlike(arg, box, unit):
if is_timedelta64_dtype(arg):
value = arg.astype('timedelta64[ns]')
elif is_integer_dtype(arg):
unit = _validate_timedelta_unit(unit)

# these are shortcutable
value = arg.astype('timedelta64[{0}]'.format(unit)).astype('timedelta64[ns]')
else:
Expand All @@ -65,6 +67,15 @@ def _convert_listlike(arg, box, unit):
# ...so it must be a scalar value. Return scalar.
return _coerce_scalar_to_timedelta_type(arg, unit=unit)

def _validate_timedelta_unit(arg):
""" provide validation / translation for timedelta short units """

if re.search("Y|W|D",arg,re.IGNORECASE) or arg == 'M':
return arg.upper()
elif re.search("h|m|s|ms|us|ns",arg,re.IGNORECASE):
return arg.lower()
raise ValueError("invalid timedelta unit {0} provided".format(arg))

_short_search = re.compile(
"^\s*(?P<neg>-?)\s*(?P<value>\d*\.?\d*)\s*(?P<unit>d|s|ms|us|ns)?\s*$",re.IGNORECASE)
_full_search = re.compile(
Expand Down