Merge pull request #8055 from anntzer/undeprecate-is_scalar_or_string

dstansby · web-flow · commit 96c75be14497 · 2017-02-11T11:15:04.000Z
Undeprecate is_scalar_or_string.
diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py
@@ -583,7 +583,6 @@ def to_filehandle(fname, flag='rU', return_opened=False):
     return fh
 
 
-@deprecated('2.1')
 def is_scalar_or_string(val):
     """Return whether the given object is a scalar or string like."""
     return is_string_like(val) or not iterable(val)
