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,

pandas/plotting/core.py renamed to pandas/plotting/_core.py

@@ -134,7 +134,7 @@ def _replot_ax(ax, freq, kwargs):
 
             # for tsplot
             if isinstance(plotf, compat.string_types):
-                from pandas.plotting.core import _plot_klass
+                from pandas.plotting._core import _plot_klass
                 plotf = _plot_klass[plotf]._plot
 
             lines.append(plotf(ax, series.index._mpl_repr(),

pandas/plotting/misc.py renamed to pandas/plotting/_misc.py

@@ -17,6 +17,7 @@
 from numpy import random
 
 import pandas.plotting as plotting
+from pandas.plotting._tools import _flatten
 
 
 """
@@ -48,12 +49,12 @@ def setUp(self):
         import matplotlib as mpl
         mpl.rcdefaults()
 
-        self.mpl_le_1_2_1 = plotting.compat._mpl_le_1_2_1()
-        self.mpl_ge_1_3_1 = plotting.compat._mpl_ge_1_3_1()
-        self.mpl_ge_1_4_0 = plotting.compat._mpl_ge_1_4_0()
-        self.mpl_ge_1_5_0 = plotting.compat._mpl_ge_1_5_0()
-        self.mpl_ge_2_0_0 = plotting.compat._mpl_ge_2_0_0()
-        self.mpl_ge_2_0_1 = plotting.compat._mpl_ge_2_0_1()
+        self.mpl_le_1_2_1 = plotting._compat._mpl_le_1_2_1()
+        self.mpl_ge_1_3_1 = plotting._compat._mpl_ge_1_3_1()
+        self.mpl_ge_1_4_0 = plotting._compat._mpl_ge_1_4_0()
+        self.mpl_ge_1_5_0 = plotting._compat._mpl_ge_1_5_0()
+        self.mpl_ge_2_0_0 = plotting._compat._mpl_ge_2_0_0()
+        self.mpl_ge_2_0_1 = plotting._compat._mpl_ge_2_0_1()
 
         if self.mpl_ge_1_4_0:
             self.bp_n_objects = 7
@@ -354,7 +355,7 @@ def _check_axes_shape(self, axes, axes_num=None, layout=None,
                 self.assertTrue(len(ax.get_children()) > 0)
 
         if layout is not None:
-            result = self._get_axes_layout(plotting.tools._flatten(axes))
+            result = self._get_axes_layout(_flatten(axes))
             self.assertEqual(result, layout)
 
         self.assert_numpy_array_equal(
@@ -380,7 +381,7 @@ def _flatten_visible(self, axes):
         axes : matplotlib Axes object, or its list-like
 
         """
-        axes = plotting.tools._flatten(axes)
+        axes = _flatten(axes)
         axes = [ax for ax in axes if ax.get_visible()]
         return axes
 

pandas/plotting/style.py renamed to pandas/plotting/_style.py

@@ -54,7 +54,8 @@ def test_boxplot_legacy(self):
             _check_plot_works(df.boxplot, by='indic')
         with tm.assert_produces_warning(UserWarning):
             _check_plot_works(df.boxplot, by=['indic', 'indic2'])
-        _check_plot_works(plotting.boxplot, data=df['one'], return_type='dict')
+        _check_plot_works(plotting._core.boxplot, data=df['one'],
+                          return_type='dict')
         _check_plot_works(df.boxplot, notch=1, return_type='dict')
         with tm.assert_produces_warning(UserWarning):
             _check_plot_works(df.boxplot, by='indic', notch=1)

pandas/plotting/timeseries.py renamed to pandas/plotting/_timeseries.py

@@ -144,7 +144,7 @@ def test_high_freq(self):
             _check_plot_works(ser.plot)
 
     def test_get_datevalue(self):
-        from pandas.plotting.converter import get_datevalue
+        from pandas.plotting._converter import get_datevalue
         self.assertIsNone(get_datevalue(None, 'D'))
         self.assertEqual(get_datevalue(1987, 'A'), 1987)
         self.assertEqual(get_datevalue(Period(1987, 'A'), 'M'),
@@ -243,7 +243,7 @@ def test_plot_multiple_inferred_freq(self):
 
     @slow
     def test_uhf(self):
-        import pandas.plotting.converter as conv
+        import pandas.plotting._converter as conv
         import matplotlib.pyplot as plt
         fig = plt.gcf()
         plt.clf()
@@ -387,7 +387,7 @@ def _test(ax):
             _test(ax)
 
     def test_get_finder(self):
-        import pandas.plotting.converter as conv
+        import pandas.plotting._converter as conv
 
         self.assertEqual(conv.get_finder('B'), conv._daily_finder)
         self.assertEqual(conv.get_finder('D'), conv._daily_finder)

pandas/plotting/tools.py renamed to pandas/plotting/_tools.py

@@ -47,15 +47,6 @@ def test_boxplot_deprecated(self):
             plotting.boxplot(df, column=['one', 'two'],
                              by='indic')
 
-    @slow
-    def test_grouped_hist_legacy(self):
-        df = pd.DataFrame(randn(500, 2), columns=['A', 'B'])
-        df['C'] = np.random.randint(0, 4, 500)
-        df['D'] = ['X'] * 500
-
-        with tm.assert_produces_warning(FutureWarning):
-            plotting.grouped_hist(df.A, by=df.C)
-
     @slow
     def test_radviz_deprecated(self):
         df = self.iris

pandas/plotting/api.py

@@ -1979,7 +1979,7 @@ def test_unordered_ts(self):
 
     def test_kind_both_ways(self):
         df = DataFrame({'x': [1, 2, 3]})
-        for kind in plotting.core._common_kinds:
+        for kind in plotting._core._common_kinds:
             if not _ok_for_gaussian_kde(kind):
                 continue
             df.plot(kind=kind)
@@ -1990,7 +1990,7 @@ def test_kind_both_ways(self):
 
     def test_all_invalid_plot_data(self):
         df = DataFrame(list('abcd'))
-        for kind in plotting.core._common_kinds:
+        for kind in plotting._core._common_kinds:
             if not _ok_for_gaussian_kde(kind):
                 continue
             with tm.assertRaises(TypeError):
@@ -2001,7 +2001,7 @@ def test_partially_invalid_plot_data(self):
         with tm.RNGContext(42):
             df = DataFrame(randn(10, 2), dtype=object)
             df[np.random.rand(df.shape[0]) > 0.5] = 'a'
-            for kind in plotting.core._common_kinds:
+            for kind in plotting._core._common_kinds:
                 if not _ok_for_gaussian_kde(kind):
                     continue
                 with tm.assertRaises(TypeError):
@@ -2454,7 +2454,7 @@ def test_memory_leak(self):
         import gc
 
         results = {}
-        for kind in plotting.core._plot_klass.keys():
+        for kind in plotting._core._plot_klass.keys():
             if not _ok_for_gaussian_kde(kind):
                 continue
             args = {}
@@ -2653,7 +2653,7 @@ def test_df_grid_settings(self):
         # Make sure plot defaults to rcParams['axes.grid'] setting, GH 9792
         self._check_grid_settings(
             DataFrame({'a': [1, 2, 3], 'b': [2, 3, 4]}),
-            plotting.core._dataframe_kinds, kws={'x': 'a', 'y': 'b'})
+            plotting._core._dataframe_kinds, kws={'x': 'a', 'y': 'b'})
 
     def test_option_mpl_style(self):
         with tm.assert_produces_warning(FutureWarning,

pandas/tests/plotting/common.py

@@ -9,7 +9,7 @@
 import numpy as np
 from numpy.random import randn
 
-import pandas.plotting as plotting
+from pandas.plotting._core import grouped_hist
 from pandas.tests.plotting.common import (TestPlotBase, _check_plot_works)
 
 
@@ -260,7 +260,7 @@ def test_grouped_hist_legacy(self):
         df['C'] = np.random.randint(0, 4, 500)
         df['D'] = ['X'] * 500
 
-        axes = plotting.grouped_hist(df.A, by=df.C)
+        axes = grouped_hist(df.A, by=df.C)
         self._check_axes_shape(axes, axes_num=4, layout=(2, 2))
 
         tm.close()
@@ -277,10 +277,9 @@ def test_grouped_hist_legacy(self):
         # make sure kwargs to hist are handled
         xf, yf = 20, 18
         xrot, yrot = 30, 40
-        axes = plotting.grouped_hist(df.A, by=df.C, normed=True,
-                                     cumulative=True, bins=4,
-                                     xlabelsize=xf, xrot=xrot,
-                                     ylabelsize=yf, yrot=yrot)
+        axes = grouped_hist(df.A, by=df.C, normed=True, cumulative=True,
+                            bins=4, xlabelsize=xf, xrot=xrot,
+                            ylabelsize=yf, yrot=yrot)
         # height of last bin (index 5) must be 1.0
         for ax in axes.ravel():
             rects = [x for x in ax.get_children() if isinstance(x, Rectangle)]
@@ -290,14 +289,14 @@ def test_grouped_hist_legacy(self):
                                 ylabelsize=yf, yrot=yrot)
 
         tm.close()
-        axes = plotting.grouped_hist(df.A, by=df.C, log=True)
+        axes = grouped_hist(df.A, by=df.C, log=True)
         # scale of y must be 'log'
         self._check_ax_scales(axes, yaxis='log')
 
         tm.close()
         # propagate attr exception from matplotlib.Axes.hist
         with tm.assertRaises(AttributeError):
-            plotting.grouped_hist(df.A, by=df.C, foo='bar')
+            grouped_hist(df.A, by=df.C, foo='bar')
 
         with tm.assert_produces_warning(FutureWarning):
             df.hist(by='C', figsize='default')

pandas/tests/plotting/test_boxplot_method.py

@@ -84,7 +84,7 @@ def scat(**kwds):
             _check_plot_works(scat, facecolor='rgb')
 
         def scat2(x, y, by=None, ax=None, figsize=None):
-            return plotting.scatter_plot(df, x, y, by, ax, figsize=None)
+            return plotting._core.scatter_plot(df, x, y, by, ax, figsize=None)
 
         _check_plot_works(scat2, x=0, y=1)
         grouper = Series(np.repeat([1, 2, 3, 4, 5], 20), df.index)