Remove mlab.Format... classes

dstansby · dstansby · commit b54296153851 · 2018-09-29T11:05:08.000+01:00
diff --git a/doc/api/next_api_changes/2018-09-18-DS.rst b/doc/api/next_api_changes/2018-09-18-DS.rst
@@ -45,4 +45,7 @@ in Matplotlib 2.2 has been removed. See below for a list:
 - `mlab.get_formatd`
 - `mlab.FormatDatetime` (use datetime.strftime instead)
 - `mlab.FormatDate` (use date.strftime instead)
+- `mlab.FormatMillions`, `mlab.FormatThousands`, `mlab.FormatPercent`,
+  `mlab.FormatBool`, `mlab.FormatInt`, `mlab.FormatFloat`,
+  `mlab.FormatFormatStr`, `mlab.FormatString`, `mlab.FormatObj`
 - `mlab.donothing_callback`
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -2161,103 +2161,6 @@ def get_converters(reader, comments):
     return r
 
 
-# a series of classes for describing the format intentions of various rec views
-@cbook.deprecated("2.2")
-class FormatObj(object):
-    def tostr(self, x):
-        return self.toval(x)
-
-    def toval(self, x):
-        return str(x)
-
-    def fromstr(self, s):
-        return s
-
-    def __hash__(self):
-        """
-        override the hash function of any of the formatters, so that we don't
-        create duplicate excel format styles
-        """
-        return hash(self.__class__)
-
-
-@cbook.deprecated("2.2")
-class FormatString(FormatObj):
-    def tostr(self, x):
-        val = repr(x)
-        return val[1:-1]
-
-
-@cbook.deprecated("2.2")
-class FormatFormatStr(FormatObj):
-    def __init__(self, fmt):
-        self.fmt = fmt
-
-    def tostr(self, x):
-        if x is None:
-            return 'None'
-        return self.fmt % self.toval(x)
-
-
-@cbook.deprecated("2.2")
-class FormatFloat(FormatFormatStr):
-    def __init__(self, precision=4, scale=1.):
-        FormatFormatStr.__init__(self, '%%1.%df' % precision)
-        self.precision = precision
-        self.scale = scale
-
-    def __hash__(self):
-        return hash((self.__class__, self.precision, self.scale))
-
-    def toval(self, x):
-        if x is not None:
-            x = x * self.scale
-        return x
-
-    def fromstr(self, s):
-        return float(s)/self.scale
-
-
-@cbook.deprecated("2.2")
-class FormatInt(FormatObj):
-
-    def tostr(self, x):
-        return '%d' % int(x)
-
-    def toval(self, x):
-        return int(x)
-
-    def fromstr(self, s):
-        return int(s)
-
-
-@cbook.deprecated("2.2")
-class FormatBool(FormatObj):
-    def toval(self, x):
-        return str(x)
-
-    def fromstr(self, s):
-        return bool(s)
-
-
-@cbook.deprecated("2.2")
-class FormatPercent(FormatFloat):
-    def __init__(self, precision=4):
-        FormatFloat.__init__(self, precision, scale=100.)
-
-
-@cbook.deprecated("2.2")
-class FormatThousands(FormatFloat):
-    def __init__(self, precision=4):
-        FormatFloat.__init__(self, precision, scale=1e-3)
-
-
-@cbook.deprecated("2.2")
-class FormatMillions(FormatFloat):
-    def __init__(self, precision=4):
-        FormatFloat.__init__(self, precision, scale=1e-6)
-
-
 class GaussianKDE(object):
     """
     Representation of a kernel-density estimate using Gaussian kernels.
