Backport PR #17600: FIX: work with PyQt 5.15

jklymak · tacaswell · commit c12c4ffb3704 · 2020-06-15T20:30:39.000-04:00
Merge pull request #17600 from tacaswell/mnt_more_qt515_fixes FIX: work with PyQt 5.15 Conflicts: lib/matplotlib/backends/backend_qt5.py - on this branch the blitting code is still in backend_qt5agg.py
diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py
@@ -452,7 +452,8 @@ def start_event_loop(self, timeout=0):
             raise RuntimeError("Event loop already running")
         self._event_loop = event_loop = QtCore.QEventLoop()
         if timeout > 0:
-            timer = QtCore.QTimer.singleShot(timeout * 1000, event_loop.quit)
+            timer = QtCore.QTimer.singleShot(int(timeout * 1000),
+                                             event_loop.quit)
         event_loop.exec_()
 
     def stop_event_loop(self, event=None):
diff --git a/lib/matplotlib/backends/backend_qt5agg.py b/lib/matplotlib/backends/backend_qt5agg.py
@@ -85,7 +85,7 @@ def blit(self, bbox=None):
             bbox = self.figure.bbox
 
         # repaint uses logical pixels, not physical pixels like the renderer.
-        l, b, w, h = [pt / self._dpi_ratio for pt in bbox.bounds]
+        l, b, w, h = [int(pt / self._dpi_ratio) for pt in bbox.bounds]
         t = b + h
         self.repaint(l, self.renderer.height / self._dpi_ratio - t, w, h)
 
