PLOT: Split matplotlib specific code from pandas plotting

asv_bench/benchmarks/timeseries.py

@@ -5,7 +5,7 @@
 from pandas import to_datetime, date_range, Series, DataFrame, period_range
 from pandas.tseries.frequencies import infer_freq
 try:
-    from pandas.plotting._converter import DatetimeConverter
+    from pandas.plotting._matplotlib.converter import DatetimeConverter
 except ImportError:
     from pandas.tseries.converter import DatetimeConverter
 

pandas/core/frame.py

@@ -101,7 +101,7 @@
 from pandas.io.formats import format as fmt
 from pandas.io.formats.printing import pprint_thing
 
-import pandas.plotting._core as gfx
+import pandas.plotting
 
 # ---------------------------------------------------------------------
 # Docstring templates
@@ -8041,9 +8041,9 @@ def isin(self, values):
 
     # ----------------------------------------------------------------------
     # Add plotting methods to DataFrame
-    plot = CachedAccessor("plot", gfx.FramePlotMethods)
-    hist = gfx.hist_frame
-    boxplot = gfx.boxplot_frame
+    plot = CachedAccessor("plot", pandas.plotting.FramePlotMethods)
+    hist = pandas.plotting.hist_frame
+    boxplot = pandas.plotting.boxplot_frame
     sparse = CachedAccessor("sparse", SparseFrameAccessor)
 
 

pandas/core/groupby/generic.py

@@ -41,7 +41,7 @@
 from pandas.core.series import Series
 from pandas.core.sparse.frame import SparseDataFrame
 
-from pandas.plotting._core import boxplot_frame_groupby
+from pandas.plotting import boxplot_frame_groupby
 
 NamedAgg = namedtuple("NamedAgg", ["column", "aggfunc"])
 # TODO(typing) the return value on this callable should be any *scalar*.

pandas/core/series.py

@@ -49,7 +49,7 @@
 from pandas.core.tools.datetimes import to_datetime
 
 import pandas.io.formats.format as fmt
-import pandas.plotting._core as gfx
+import pandas.plotting
 
 __all__ = ['Series']
 
@@ -4502,12 +4502,12 @@ def to_period(self, freq=None, copy=True):
     str = CachedAccessor("str", StringMethods)
     dt = CachedAccessor("dt", CombinedDatetimelikeProperties)
     cat = CachedAccessor("cat", CategoricalAccessor)
-    plot = CachedAccessor("plot", gfx.SeriesPlotMethods)
+    plot = CachedAccessor("plot", pandas.plotting.SeriesPlotMethods)
     sparse = CachedAccessor("sparse", SparseAccessor)
 
     # ----------------------------------------------------------------------
     # Add plotting methods to Series
-    hist = gfx.hist_series
+    hist = pandas.plotting.hist_series
 
 
 Series._setup_axes(['index'], info_axis=0, stat_axis=0, aliases={'rows': 0},

pandas/plotting/__init__.py

@@ -1,20 +1,18 @@
 """
-Plotting api
+Plotting public API
 """
+from pandas.plotting._core import (
+    FramePlotMethods, SeriesPlotMethods, boxplot, boxplot_frame,
+    boxplot_frame_groupby, hist_frame, hist_series)
+from pandas.plotting._misc import (
+    andrews_curves, autocorrelation_plot, bootstrap_plot,
+    deregister as deregister_matplotlib_converters, lag_plot,
+    parallel_coordinates, plot_params, radviz,
+    register as register_matplotlib_converters, scatter_matrix, table)
 
-# flake8: noqa
-
-from pandas.plotting._misc import (scatter_matrix, radviz,
-                                   andrews_curves, bootstrap_plot,
-                                   parallel_coordinates, lag_plot,
-                                   autocorrelation_plot)
-from pandas.plotting._core import boxplot
-from pandas.plotting._style import plot_params
-from pandas.plotting._tools import table
-try:
-    from pandas.plotting._converter import (
-        register as register_matplotlib_converters)
-    from pandas.plotting._converter import (
-        deregister as deregister_matplotlib_converters)
-except ImportError:
-    pass
+__all__ = ['boxplot', 'boxplot_frame', 'boxplot_frame_groupby', 'hist_frame',
+           'hist_series', 'FramePlotMethods', 'SeriesPlotMethods',
+           'scatter_matrix', 'radviz', 'andrews_curves', 'bootstrap_plot',
+           'parallel_coordinates', 'lag_plot', 'autocorrelation_plot',
+           'table', 'plot_params', 'register_matplotlib_converters',
+           'deregister_matplotlib_converters']