Fix import order, revise the patch and add test with more kinds of plotting.

Signed-off-by: HE, Tao <[email protected]>

Author: sighingnow

pandas/plotting/_core.py

@@ -15,8 +15,8 @@
 from pandas.util._decorators import Appender, cache_readonly
 
 from pandas.core.dtypes.common import (
-    is_hashable, is_integer, is_iterator, is_list_like, is_number,
-    is_extension_array_dtype)
+    is_extension_array_dtype, is_hashable, is_integer, is_iterator,
+    is_list_like, is_number)
 from pandas.core.dtypes.generic import (
     ABCDataFrame, ABCIndexClass, ABCMultiIndex, ABCPeriodIndex, ABCSeries)
 from pandas.core.dtypes.missing import isna, notna, remove_na_arraylike
@@ -364,6 +364,12 @@ def _compute_plot_data(self):
             raise TypeError('Empty {0!r}: no numeric data to '
                             'plot'.format(numeric_data.__class__.__name__))
 
+        # GH25587: cast ExtensionArray of pandas (IntegerArray, etc.) to
+        # np.ndarray before plot.
+        for col in numeric_data:
+            if is_extension_array_dtype(numeric_data[col]):
+                numeric_data[col] = np.asarray(numeric_data[col])
+
         self.data = numeric_data
 
     def _make_plot(self):
@@ -575,13 +581,6 @@ def _get_xticks(self, convert_period=False):
 
     @classmethod
     def _plot(cls, ax, x, y, style=None, is_errorbar=False, **kwds):
-        # GH25587: cast ExtensionArray of pandas (IntegerArray, etc.) to
-        # np.ndarray before plot.
-        if is_extension_array_dtype(x):
-            x = np.asarray(x)
-        if is_extension_array_dtype(y):
-            y = np.asarray(y)
-
         mask = isna(y)
         if mask.any():
             y = np.ma.array(y)

pandas/tests/plotting/test_frame.py

@@ -13,6 +13,7 @@
 from pandas.compat import PY3, lmap, lrange, lzip, range, u, zip
 import pandas.util._test_decorators as td
 
+from pandas.core.arrays import integer_array
 from pandas.core.dtypes.api import is_list_like
 
 import pandas as pd
@@ -144,14 +145,24 @@ def test_plot(self):
         result = ax.axes
         assert result is axes[0]
 
-    @pytest.mark.parametrize("kwargs", [
-        dict(yticks=[1, 2, 3, 4]),
-        dict(xticks=[4, 5, 3, 2])
-    ])
-    def test_integer_array_plot(self, kwargs):
+    def test_integer_array_plot(self):
         # GH 25587
-        s = Series([4, 5, 3, 2], dtype="UInt32")
-        _check_plot_works(s.plot, **kwargs)
+        arr = integer_array([1, 2, 3, 4], dtype="UInt32")
+
+        s = Series(arr)
+        _check_plot_works(s.plot.line)
+        _check_plot_works(s.plot.bar)
+        _check_plot_works(s.plot.hist)
+        _check_plot_works(s.plot.pie)
+
+        df = DataFrame({'x': arr, 'y': arr})
+        _check_plot_works(df.plot.line)
+        _check_plot_works(df.plot.bar)
+        _check_plot_works(df.plot.hist)
+        _check_plot_works(df.plot.area)
+        _check_plot_works(df.plot.pie, y='y')
+        _check_plot_works(df.plot.scatter, x='x', y='y')
+        _check_plot_works(df.plot.hexbin, x='x', y='y')
 
     def test_mpl2_color_cycle_str(self):
         # GH 15516