Merge pull request #1142 from nstelter-slac/pyside6_upgrade_pt_2

MNT: Replace PyQt-specific sip library with wrapper provided by pyqt

pydm/data_plugins/archiver_plugin.py

@@ -7,7 +7,7 @@
 from typing import Optional
 
 from pydm.widgets.channel import PyDMChannel
-from qtpy import sip
+from qtpy.compat import isalive
 from qtpy.QtCore import Slot, QObject, QUrl, QTimer
 from qtpy.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply
 from pydm.data_plugins.plugin import PyDMPlugin, PyDMConnection
@@ -93,7 +93,7 @@ def fetch_data(self, from_date: float, to_date: float, processing_command: Optio
         reply = self.network_manager.get(request)
 
         def timeout():
-            if not isinstance(reply, QNetworkReply) or sip.isdeleted(reply):
+            if not isinstance(reply, QNetworkReply) or not isalive(reply):
                 return
             reply.abort()
 

pydm/data_plugins/plugin.py

@@ -5,7 +5,7 @@
 from typing import Optional, Callable
 
 from ..utilities.remove_protocol import parsed_address
-from qtpy import sip
+from qtpy.compat import isalive
 from qtpy.QtCore import Signal, QObject, Qt
 from qtpy.QtWidgets import QApplication
 from .. import config
@@ -318,6 +318,6 @@ def remove_connection(self, channel, destroying=False):
                 self.connections[connection_id].remove_listener(channel, destroying=destroying)
                 self.channels.remove(channel)
                 if self.connections[connection_id].listener_count < 1:
-                    if not sip.isdeleted(self.connections[connection_id]):
+                    if isalive(self.connections[connection_id]):
                         self.connections[connection_id].deleteLater()
                     del self.connections[connection_id]