Fix poorly done deprecations in image.py.

Author: anntzer

lib/matplotlib/backends/qt_editor/figureoptions.py

@@ -16,7 +16,7 @@
 import re
 
 import matplotlib
-from matplotlib import cm, markers, colors as mcolors
+from matplotlib import cm, colors as mcolors, markers, image as mimage
 import matplotlib.backends.qt_editor.formlayout as formlayout
 from matplotlib.backends.qt_compat import QtGui
 
@@ -165,7 +165,7 @@ def prepare_data(d, init):
             ('Max. value', high),
             ('Interpolation',
              [image.get_interpolation()]
-             + [(name, name) for name in sorted(image.iterpnames)])]
+             + [(name, name) for name in sorted(mimage.interpolations_names)])]
         images.append([imagedata, label, ""])
     # Is there an image displayed?
     has_image = bool(images)

lib/matplotlib/image.py

@@ -180,14 +180,17 @@ def _rgb_to_rgba(A):
 class _ImageBase(martist.Artist, cm.ScalarMappable):
     zorder = 0
 
+    @property
     @cbook.deprecated("2.1")
     def _interpd(self):
         return _interpd_
 
+    @property
     @cbook.deprecated("2.1")
     def _interpdr(self):
         return {v: k for k, v in six.iteritems(_interpd_)}
 
+    @property
     @cbook.deprecated("2.1")
     def iterpnames(self):
         return interpolations_names