remaining feedback + reorg

Author: jorisvandenbossche

pandas/__init__.py

@@ -52,7 +52,7 @@
 
 # deprecate tools.plotting, plot_params and scatter_matrix on the top namespace
 import pandas.tools.plotting
-plot_params = pandas.plotting.style._Options(deprecated=True)
+plot_params = pandas.plotting._style._Options(deprecated=True)
 # do not import deprecate to top namespace
 scatter_matrix = pandas.util.decorators.deprecate(
     'pandas.scatter_matrix', pandas.plotting.scatter_matrix,

pandas/core/config_init.py

@@ -285,7 +285,7 @@ def mpl_style_cb(key):
                   stacklevel=5)
 
     import sys
-    from pandas.plotting.style import mpl_stylesheet
+    from pandas.plotting._style import mpl_stylesheet
     global style_backup
 
     val = cf.get_option(key)

pandas/core/frame.py

@@ -90,7 +90,7 @@
 import pandas.core.ops as ops
 import pandas.formats.format as fmt
 from pandas.formats.printing import pprint_thing
-import pandas.plotting.core as gfx
+import pandas.plotting._core as gfx
 
 from pandas._libs import lib, algos as libalgos
 
@@ -5909,11 +5909,11 @@ def _put_str(s, space):
 @Appender(_shared_docs['boxplot'] % _shared_doc_kwargs)
 def boxplot(self, column=None, by=None, ax=None, fontsize=None, rot=0,
             grid=True, figsize=None, layout=None, return_type=None, **kwds):
-    import pandas.plotting as plots
+    from pandas.plotting._core import boxplot
     import matplotlib.pyplot as plt
-    ax = plots.boxplot(self, column=column, by=by, ax=ax, fontsize=fontsize,
-                       grid=grid, rot=rot, figsize=figsize, layout=layout,
-                       return_type=return_type, **kwds)
+    ax = boxplot(self, column=column, by=by, ax=ax, fontsize=fontsize,
+                 grid=grid, rot=rot, figsize=figsize, layout=layout,
+                 return_type=return_type, **kwds)
     plt.draw_if_interactive()
     return ax
 

pandas/core/groupby.py

@@ -4159,7 +4159,7 @@ def groupby_series(obj, col=None):
         return results
 
 
-from pandas.plotting.core import boxplot_frame_groupby  # noqa
+from pandas.plotting._core import boxplot_frame_groupby  # noqa
 DataFrameGroupBy.boxplot = boxplot_frame_groupby
 
 

pandas/core/series.py

@@ -3001,7 +3001,7 @@ def create_from_value(value, index, dtype):
 # ----------------------------------------------------------------------
 # Add plotting methods to Series
 
-import pandas.plotting.core as _gfx  # noqa
+import pandas.plotting._core as _gfx  # noqa
 
 Series.plot = base.AccessorProperty(_gfx.SeriesPlotMethods,
                                     _gfx.SeriesPlotMethods)

pandas/plotting/__init__.py

@@ -1 +1,19 @@
-from pandas.plotting.api import *           # noqa
+"""
+Plotting api
+"""
+
+# flake8: noqa
+
+try:  # mpl optional
+    from pandas.plotting import _converter
+    _converter.register()  # needs to override so set_xlim works with str/number
+except ImportError:
+    pass
+
+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

pandas/plotting/compat.py renamed to pandas/plotting/_compat.py

@@ -26,14 +26,14 @@
 from pandas.formats.printing import pprint_thing
 from pandas.util.decorators import Appender
 
-from pandas.plotting.compat import (_mpl_ge_1_3_1,
-                                    _mpl_ge_1_5_0)
-from pandas.plotting.style import (mpl_stylesheet, plot_params,
-                                   _get_standard_colors)
-from pandas.plotting.tools import (_subplots, _flatten, table,
-                                   _handle_shared_axes, _get_all_lines,
-                                   _get_xlim, _set_ticks_props,
-                                   format_date_labels)
+from pandas.plotting._compat import (_mpl_ge_1_3_1,
+                                     _mpl_ge_1_5_0)
+from pandas.plotting._style import (mpl_stylesheet, plot_params,
+                                    _get_standard_colors)
+from pandas.plotting._tools import (_subplots, _flatten, table,
+                                    _handle_shared_axes, _get_all_lines,
+                                    _get_xlim, _set_ticks_props,
+                                    format_date_labels)
 
 
 if _mpl_ge_1_5_0():
@@ -900,12 +900,12 @@ def _is_ts_plot(self):
         return not self.x_compat and self.use_index and self._use_dynamic_x()
 
     def _use_dynamic_x(self):
-        from pandas.plotting.timeseries import _use_dynamic_x
+        from pandas.plotting._timeseries import _use_dynamic_x
         return _use_dynamic_x(self._get_ax(0), self.data)
 
     def _make_plot(self):
         if self._is_ts_plot():
-            from pandas.plotting.timeseries import _maybe_convert_index
+            from pandas.plotting._timeseries import _maybe_convert_index
             data = _maybe_convert_index(self._get_ax(0), self.data)
 
             x = data.index      # dummy, not used
@@ -955,9 +955,9 @@ def _plot(cls, ax, x, y, style=None, column_num=None,
 
     @classmethod
     def _ts_plot(cls, ax, x, data, style=None, **kwds):
-        from pandas.plotting.timeseries import (_maybe_resample,
-                                                _decorate_axes,
-                                                format_dateaxis)
+        from pandas.plotting._timeseries import (_maybe_resample,
+                                                 _decorate_axes,
+                                                 format_dateaxis)
         # accept x to be consistent with normal plot func,
         # x is not passed to tsplot as it uses data.index as x coordinate
         # column_num must be in kwds for stacking purpose

pandas/plotting/converter.py renamed to pandas/plotting/_converter.py

@@ -10,8 +10,8 @@
 from pandas.formats.printing import pprint_thing
 
 
-from pandas.plotting.style import _get_standard_colors
-from pandas.plotting.tools import _subplots, _set_ticks_props
+from pandas.plotting._style import _get_standard_colors
+from pandas.plotting._tools import _subplots, _set_ticks_props
 
 
 def scatter_matrix(frame, alpha=0.5, figsize=None, ax=None, grid=False,