Replaced DeprecationWarnings with mplDeprecation warnigns

NelleV · NelleV · commit 94d6b422523e · 2013-01-14T16:02:36.000+01:00
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -10,8 +10,6 @@
 import matplotlib
 rcParams = matplotlib.rcParams
 
-from matplotlib import MatplotlibDeprecationWarning as MDeprecation
-
 import matplotlib.artist as martist
 from matplotlib.artist import allow_rasterization
 import matplotlib.axis as maxis
@@ -1053,8 +1051,8 @@ def set_aspect(self, aspect, adjustable=None, anchor=None):
             the option 'normal' for aspect is deprecated. Use 'auto' instead.
         """
         if aspect == 'normal':
-            raise MDeprecation("Use 'auto' instead of 'normal' for "
-                                     "aspect. Will be removed in 1.4.x")
+            warnings.warn("Use 'auto' instead of 'normal' for aspect. Will "
+                          "be removed in 1.4.x", mplDeprecation)
             self._aspect = 'auto'
 
         elif aspect in ('equal', 'auto'):
@@ -7264,8 +7262,8 @@ def pcolor(self, *args, **kwargs):
         vmin = kwargs.pop('vmin', None)
         vmax = kwargs.pop('vmax', None)
         if 'shading' in kwargs:
-            raise DeprecationWarning("Use edgecolors instead of shading. "
-                                     "Will be removed in 1.4")
+            warnings.warn("Use edgecolors instead of shading. "
+                          "Will be removed in 1.4", mplDeprecation)
         shading = kwargs.pop('shading', 'flat')
 
         X, Y, C = self._pcolorargs('pcolor', *args)
@@ -7310,7 +7308,6 @@ def pcolor(self, *args, **kwargs):
             kwargs['linewidths'] = kwargs.pop('linewidth')
         kwargs.setdefault('linewidths', linewidths)
 
-
         if shading == 'faceted':
             edgecolors = 'k',
         else:
@@ -7320,7 +7317,6 @@ def pcolor(self, *args, **kwargs):
             kwargs['edgecolors'] = kwargs.pop('edgecolor')
         ec = kwargs.setdefault('edgecolors', edgecolors)
 
-
         # aa setting will default via collections to patch.antialiased
         # unless the boundary is not stroked, in which case the
         # default will be False; with unstroked boundaries, aa
