Skip to content

Clean up _parse_array_of_cftime_strings #2464

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 2 commits into from
Oct 5, 2018
Merged

Clean up _parse_array_of_cftime_strings #2464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cd5dba
Make _parse_array_of_cftime_strings more robust
spencerkclark Oct 4, 2018
346d2e1
lint
spencerkclark Oct 4, 2018
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
7 changes: 2 additions & 5 deletions xarray/coding/cftimeindex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,8 +389,5 @@ def _parse_array_of_cftime_strings(strings, date_type):
-------
np.array
"""
if strings.ndim == 0:
return np.array(_parse_iso8601_without_reso(date_type, strings.item()))
else:
return np.array([_parse_iso8601_without_reso(date_type, s)
for s in strings])
return np.array([_parse_iso8601_without_reso(date_type, s)
for s in strings.ravel()]).reshape(strings.shape)
8 changes: 5 additions & 3 deletions xarray/tests/test_cftimeindex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,9 +689,11 @@ def test_cftimeindex_shift_invalid_freq():
def test_parse_array_of_cftime_strings():
from cftime import DatetimeNoLeap

strings = np.array(['2000-01-01', '2000-01-02'])
expected = np.array([DatetimeNoLeap(2000, 1, 1),
DatetimeNoLeap(2000, 1, 2)])
strings = np.array([['2000-01-01', '2000-01-02'],
['2000-01-03', '2000-01-04']])
expected = np.array(
[[DatetimeNoLeap(2000, 1, 1), DatetimeNoLeap(2000, 1, 2)],
[DatetimeNoLeap(2000, 1, 3), DatetimeNoLeap(2000, 1, 4)]])

result = _parse_array_of_cftime_strings(strings, DatetimeNoLeap)
np.testing.assert_array_equal(result, expected)
Expand Down