further fixups

Author: jorisvandenbossche

pandas/__init__.py

@@ -51,7 +51,7 @@
 from pandas.tools.pivot import pivot_table, crosstab
 
 # deprecate tools.plotting, plot_params and scatter_matrix on the top namespace
-import pandas.tools.plotting
+#import pandas.tools.plotting
 plot_params = pandas.plotting._style._Options(deprecated=True)
 # do not import deprecate to top namespace
 scatter_matrix = pandas.util.decorators.deprecate(

pandas/plotting/_style.py

@@ -4,12 +4,14 @@
 
 import warnings
 from contextlib import contextmanager
+import re
 
 import numpy as np
 
 from pandas.types.common import is_list_like
 from pandas.compat import range, lrange, lmap
 import pandas.compat as compat
+from pandas.plotting._compat import _mpl_ge_2_0_0
 
 
 # Extracted from https://gist.github.com/huyng/816622

pandas/tests/api/test_api.py

@@ -31,7 +31,7 @@ class TestPDApi(Base, tm.TestCase):
 
     # top-level sub-packages
     lib = ['api', 'compat', 'computation', 'core',
-           'indexes', 'formats', 'errors', 'pandas', 'plotting'
+           'indexes', 'formats', 'errors', 'pandas', 'plotting',
            'test', 'tools', 'tseries', 'sparse',
            'types', 'util', 'options', 'io']
 

pandas/tests/plotting/test_deprecated.py

@@ -1,13 +1,11 @@
 # coding: utf-8
 
-import nose
 import string
 
 import pandas as pd
 import pandas.util.testing as tm
 from pandas.util.testing import slow
 
-import numpy as np
 from numpy.random import randn
 
 import pandas.tools.plotting as plotting
@@ -58,8 +56,3 @@ def test_plot_params(self):
 
         with tm.assert_produces_warning(FutureWarning):
             pd.plot_params['xaxis.compat'] = True
-
-
-if __name__ == '__main__':
-    nose.runmodule(argv=[__file__, '-vvs', '-x', '--pdb', '--pdb-failure'],
-                   exit=False)