Skip to content

Backport PR #10638 on branch v2.2.x #10663

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
Mar 4, 2018
Merged

Backport PR #10638 on branch v2.2.x #10663

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: 4 additions & 0 deletions lib/matplotlib/dates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,10 @@ def date2num(d):
For details see the module docstring.
"""

if hasattr(d, "values"):
# this unpacks pandas series or dataframes...
d = d.values

if ((isinstance(d, np.ndarray) and np.issubdtype(d.dtype, np.datetime64))
or isinstance(d, np.datetime64)):
return _dt64_to_ordinalf(d)
Expand Down
4 changes: 4 additions & 0 deletions lib/matplotlib/units.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,10 @@ def get_converter(self, x):
if classx is not None:
converter = self.get(classx)

if converter is None and hasattr(x, "values"):
# this unpacks pandas series or dataframes...
x = x.values

# If x is an array, look inside the array for data with units
if isinstance(x, np.ndarray) and x.size:
xravel = x.ravel()
Expand Down