also move plot_params

Author: jorisvandenbossche

doc/source/visualization.rst

@@ -1228,14 +1228,14 @@ Using the ``x_compat`` parameter, you can suppress this behavior:
    plt.close('all')
 
 If you have more than one plot that needs to be suppressed, the ``use`` method
-in ``pandas.plot_params`` can be used in a `with statement`:
+in ``pandas.plotting.plot_params`` can be used in a `with statement`:
 
 .. ipython:: python
 
    plt.figure()
 
    @savefig ser_plot_suppress_context.png
-   with pd.plot_params.use('x_compat', True):
+   with pd.plotting.plot_params.use('x_compat', True):
        df.A.plot(color='r')
        df.B.plot(color='g')
        df.C.plot(color='b')

doc/source/whatsnew/v0.20.0.txt

@@ -563,12 +563,11 @@ Using ``.iloc``. Here we will get the location of the 'A' column, then use *posi
 Deprecate .plotting
 ^^^^^^^^^^^^^^^^^^^
 
-``pandas.tools.plotting`` module has been deprecated, moving directory under the
-top namespace ``pandas.plotting``. All the public plotting functions should be available
+The ``pandas.tools.plotting`` module has been deprecated,  in favor of the top level ``pandas.plotting`` module. All the public plotting functions are now available
 from ``pandas.plotting``.
 
-Also, ``scatter_matrix`` function imported directly under ``pandas`` namespace is also deprecated.
-Users shoud use ``pandas.plotting.scatter_matrix`` instead.
+Further, the top-level ``pandas.scatter_matrix`` and ``pandas.plot_params`` are also deprecated.
+Users can import these from ``pandas.plotting`` as well.
 
 Previous script:
 

pandas/__init__.py

@@ -50,9 +50,9 @@
                                 merge_ordered, merge_asof)
 from pandas.tools.pivot import pivot_table, crosstab
 
-# deprecate tools.plotting, and scatter_matrix on the top namespace
+# deprecate tools.plotting, plot_params and scatter_matrix on the top namespace
 import pandas.tools.plotting
-from pandas.plotting import plot_params
+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/plotting/style.py

@@ -179,16 +179,26 @@ class _Options(dict):
     _ALIASES = {'x_compat': 'xaxis.compat'}
     _DEFAULT_KEYS = ['xaxis.compat']
 
-    def __init__(self):
-        self['xaxis.compat'] = False
+    def __init__(self, deprecated=False):
+        self._deprecated = deprecated
+        # self['xaxis.compat'] = False
+        super(_Options, self).__setitem__('xaxis.compat', False)
+
+    def _warn_if_deprecated(self):
+        if self._deprecated:
+            warnings.warn("'pandas.plot_params' is deprecated. Use "
+                          "'pandas.plotting.plot_params' instead",
+                          FutureWarning, stacklevel=3)
 
     def __getitem__(self, key):
+        self._warn_if_deprecated()
         key = self._get_canonical_key(key)
         if key not in self:
             raise ValueError('%s is not a valid pandas plotting option' % key)
         return super(_Options, self).__getitem__(key)
 
     def __setitem__(self, key, value):
+        self._warn_if_deprecated()
         key = self._get_canonical_key(key)
         return super(_Options, self).__setitem__(key, value)
 
@@ -210,6 +220,7 @@ def reset(self):
         -------
         None
         """
+        self._warn_if_deprecated()
         self.__init__()
 
     def _get_canonical_key(self, key):
@@ -221,6 +232,7 @@ def use(self, key, value):
         Temporarily set a parameter value using the with statement.
         Aliasing allowed.
         """
+        self._warn_if_deprecated()
         old_value = self[key]
         try:
             self[key] = value

pandas/tests/api/test_api.py

@@ -69,7 +69,7 @@ class TestPDApi(Base, tm.TestCase):
              'melt', 'notnull', 'offsets',
              'merge', 'merge_ordered', 'merge_asof',
              'period_range',
-             'pivot', 'pivot_table', 'plot_params', 'qcut',
+             'pivot', 'pivot_table', 'qcut',
              'scatter_matrix',
              'show_versions', 'timedelta_range', 'unique',
              'value_counts', 'wide_to_long']
@@ -103,7 +103,7 @@ class TestPDApi(Base, tm.TestCase):
                         'rolling_median', 'rolling_min', 'rolling_quantile',
                         'rolling_skew', 'rolling_std', 'rolling_sum',
                         'rolling_var', 'rolling_window', 'ordered_merge',
-                        'pnow', 'match', 'groupby', 'get_store']
+                        'pnow', 'match', 'groupby', 'get_store', 'plot_params']
 
     def test_api(self):