|
11 | 11 |
|
12 | 12 | from pandas.util._decorators import cache_readonly
|
13 | 13 | from pandas.core.base import PandasObject
|
| 14 | +from pandas.core.dtypes.generic import ABCSeries |
14 | 15 | from pandas.core.dtypes.missing import notnull
|
15 | 16 | from pandas.core.dtypes.common import (
|
16 | 17 | is_list_like,
|
|
21 | 22 | from pandas.core.common import AbstractMethodError, isnull, _try_sort
|
22 | 23 | from pandas.core.generic import _shared_docs, _shared_doc_kwargs
|
23 | 24 | from pandas.core.index import Index, MultiIndex
|
24 |
| -from pandas.core.series import Series, remove_na |
25 | 25 | from pandas.core.indexes.period import PeriodIndex
|
26 | 26 | from pandas.compat import range, lrange, map, zip, string_types
|
27 | 27 | import pandas.compat as compat
|
@@ -334,7 +334,7 @@ def result(self):
|
334 | 334 | def _compute_plot_data(self):
|
335 | 335 | data = self.data
|
336 | 336 |
|
337 |
| - if isinstance(data, Series): |
| 337 | + if isinstance(data, ABCSeries): |
338 | 338 | label = self.label
|
339 | 339 | if label is None and data.name is None:
|
340 | 340 | label = 'None'
|
@@ -1376,6 +1376,7 @@ def _plot(cls, ax, y, style=None, bw_method=None, ind=None,
|
1376 | 1376 | from scipy.stats import gaussian_kde
|
1377 | 1377 | from scipy import __version__ as spv
|
1378 | 1378 |
|
| 1379 | + from pandas.core.series import remove_na |
1379 | 1380 | y = remove_na(y)
|
1380 | 1381 |
|
1381 | 1382 | if LooseVersion(spv) >= '0.11.0':
|
@@ -1494,6 +1495,7 @@ def _args_adjust(self):
|
1494 | 1495 |
|
1495 | 1496 | @classmethod
|
1496 | 1497 | def _plot(cls, ax, y, column_num=None, return_type='axes', **kwds):
|
| 1498 | + from pandas.core.series import remove_na |
1497 | 1499 | if y.ndim == 2:
|
1498 | 1500 | y = [remove_na(v) for v in y]
|
1499 | 1501 | # Boxplot fails with empty arrays, so need to add a NaN
|
@@ -1566,6 +1568,7 @@ def maybe_color_bp(self, bp):
|
1566 | 1568 |
|
1567 | 1569 | def _make_plot(self):
|
1568 | 1570 | if self.subplots:
|
| 1571 | + from pandas import Series |
1569 | 1572 | self._return_obj = Series()
|
1570 | 1573 |
|
1571 | 1574 | for i, (label, y) in enumerate(self._iter_data()):
|
@@ -1968,6 +1971,7 @@ def maybe_color_bp(bp):
|
1968 | 1971 | setp(bp['medians'], color=colors[2], alpha=1)
|
1969 | 1972 |
|
1970 | 1973 | def plot_group(keys, values, ax):
|
| 1974 | + from pandas.core.series import remove_na |
1971 | 1975 | keys = [pprint_thing(x) for x in keys]
|
1972 | 1976 | values = [remove_na(v) for v in values]
|
1973 | 1977 | bp = ax.boxplot(values, **kwds)
|
@@ -2317,6 +2321,7 @@ def boxplot_frame_groupby(grouped, subplots=True, column=None, fontsize=None,
|
2317 | 2321 | figsize=figsize, layout=layout)
|
2318 | 2322 | axes = _flatten(axes)
|
2319 | 2323 |
|
| 2324 | + from pandas import Series |
2320 | 2325 | ret = Series()
|
2321 | 2326 | for (key, group), ax in zip(grouped, axes):
|
2322 | 2327 | d = group.boxplot(ax=ax, column=column, fontsize=fontsize,
|
@@ -2388,6 +2393,7 @@ def _grouped_plot_by_column(plotf, data, columns=None, by=None,
|
2388 | 2393 |
|
2389 | 2394 | _axes = _flatten(axes)
|
2390 | 2395 |
|
| 2396 | + from pandas import Series |
2391 | 2397 | result = Series()
|
2392 | 2398 | ax_values = []
|
2393 | 2399 |
|
|
0 commit comments