MNT: fix rebase

matplotlib · Aug 7, 2021 · 5580b0d · 5580b0d
1 parent 3de6940
commit 5580b0d
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/matplotlib/backends/qt_compat.py b/lib/matplotlib/backends/qt_compat.py
@@ -18,6 +18,7 @@
 import sys
 import signal
 import socket
+import contextlib
 
 from packaging.version import parse as parse_version
 
@@ -228,8 +229,9 @@ def _maybe_allow_interrupt(qapp):
         wsock, rsock = socket.socketpair()
         wsock.setblocking(False)
         old_wakeup_fd = signal.set_wakeup_fd(wsock.fileno())
-        sn = QtCore.QSocketNotifier(rsock.fileno(),
-                                    QtCore.QSocketNotifier.Read)
+        sn = QtCore.QSocketNotifier(
+            rsock.fileno(), _enum('QtCore.QSocketNotifier.Type').Read
+        )
 
         @sn.activated.connect
         def on_signal(*args):
@@ -252,7 +254,7 @@ def handle(*args):
             signal.set_wakeup_fd(old_wakeup_fd)
             signal.signal(signal.SIGINT, old_sigint_handler)
             if handler_args is not None:
-                old_sigint_handler(handler_args)
+                old_sigint_handler(*handler_args)
 
 # class _maybe_allow_interrupt:
 #