MNT: fix warnings on py38

tacaswell · tacaswell · commit c864b7b7d95e · 2019-10-19T13:09:34.000-04:00
These were fixed the on the master branch as part of bigger PRs or in
different ways that are not worth backporting
diff --git a/lib/matplotlib/backends/backend_qt5agg.py b/lib/matplotlib/backends/backend_qt5agg.py
@@ -68,7 +68,7 @@ def paintEvent(self, e):
             if hasattr(qimage, 'setDevicePixelRatio'):
                 # Not available on Qt4 or some older Qt5.
                 qimage.setDevicePixelRatio(self._dpi_ratio)
-            origin = QtCore.QPoint(l, self.renderer.height - t)
+            origin = QtCore.QPoint(int(l), int(self.renderer.height - t))
             painter.drawImage(origin / self._dpi_ratio, qimage)
 
         self._draw_rect_callback(painter)
diff --git a/lib/matplotlib/backends/qt_editor/figureoptions.py b/lib/matplotlib/backends/qt_editor/figureoptions.py
@@ -222,7 +222,7 @@ def apply_callback(data):
             rgba = mcolors.to_rgba(color)
             line.set_alpha(None)
             line.set_color(rgba)
-            if marker is not 'none':
+            if marker != 'none':
                 line.set_marker(marker)
                 line.set_markersize(markersize)
                 line.set_markerfacecolor(markerfacecolor)
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -870,7 +870,7 @@ def __init__(self, ax, *args, **kwargs):
             self.logscale = True
             if norm is None:
                 norm = colors.LogNorm()
-            if self.extend is not 'neither':
+            if self.extend != 'neither':
                 raise ValueError('extend kwarg does not work yet with log '
                                  ' scale')
         else:
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -43,8 +43,10 @@
             The font directory code is from ttfquery,
             see license/LICENSE_TTFQUERY.
 """
-
-from collections import Iterable
+try:
+    from collections.abc import Iterable
+except ImportError:
+    from collections import Iterable
 import json
 import os
 import sys
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -2419,7 +2419,7 @@ def matshow(A, fignum=None, **kwargs):
 
     """
     A = np.asanyarray(A)
-    if fignum is False or fignum is 0:
+    if fignum is False or fignum == 0:
         ax = gca()
     else:
         # Extract actual aspect ratio of array and make appropriately sized figure
