Move default format dict inside method

dstansby · dstansby · commit 1d017bd7001e · 2017-09-25T15:05:44.000+01:00
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -3097,21 +3097,19 @@ def fromstr(self, x):
         return dateutil.parser.parse(x)
 
 
-defaultformatd = {
-    np.bool_:   FormatBool(),
-    np.int16:   FormatInt(),
-    np.int32:   FormatInt(),
-    np.int64:   FormatInt(),
-    np.float32: FormatFloat(),
-    np.float64: FormatFloat(),
-    np.object_: FormatObj(),
-    np.string_: FormatString(),
-    }
-
-
 @cbook.deprecated("2.2")
 def get_formatd(r, formatd=None):
     'build a formatd guaranteed to have a key for every dtype name'
+    defaultformatd = {
+        np.bool_: FormatBool(),
+        np.int16: FormatInt(),
+        np.int32: FormatInt(),
+        np.int64: FormatInt(),
+        np.float32: FormatFloat(),
+        np.float64: FormatFloat(),
+        np.object_: FormatObj(),
+        np.string_: FormatString()}
+
     if formatd is None:
         formatd = dict()
 
@@ -3328,8 +3326,8 @@ def newfunc(val, mask, mval):
 
 @cbook.deprecated('2.2')
 def griddata(x, y, z, xi, yi, interp='nn'):
-    """Interpolates from a nonuniformly spaced grid to some other
-    grid.
+    """
+    Interpolates from a nonuniformly spaced grid to some other grid.
 
     Fits a surface of the form z = f(`x`, `y`) to the data in the
     (usually) nonuniformly spaced vectors (`x`, `y`, `z`), then
