Merge pull request #1189 from nstelter-slac/make_weak_ref

MNT: make sure we pass a weak ref of the current object to widget_destroyed

Author: jbellister-slac

examples/camviewer/camviewer.py

@@ -1,6 +1,7 @@
 # import epics
 # from qtpy import uic
 import functools
+import weakref
 from qtpy.QtCore import Slot, Signal, QPointF, QRectF
 from qtpy.QtGui import QPen
 from qtpy.QtWidgets import QSizePolicy
@@ -141,7 +142,7 @@ def __init__(self, parent=None, args=None):
         self.ui.setROIButton.clicked.connect(self.setROI)
         self.ui.resetROIButton.clicked.connect(self.resetROI)
 
-        self.destroyed.connect(functools.partial(widget_destroyed, self.channels))
+        self.destroyed.connect(functools.partial(widget_destroyed, self.channels, weakref.ref(self)))
 
     @Slot()
     def zoomIn(self):

pydm/widgets/baseplot.py

@@ -1,6 +1,7 @@
 import functools
 import json
 import warnings
+import weakref
 from abc import abstractmethod
 from qtpy.QtGui import QColor, QBrush, QMouseEvent
 from qtpy.QtCore import Signal, Slot, Property, QTimer, Qt, QEvent, QObject, QRect
@@ -126,7 +127,7 @@ def __init__(
         self.bar_graph_item = None
 
         if hasattr(self, "channels"):
-            self.destroyed.connect(functools.partial(widget_destroyed, self.channels))
+            self.destroyed.connect(functools.partial(widget_destroyed, self.channels, weakref.ref(self)))
 
     @property
     def color_string(self) -> str:

pydm/widgets/logdisplay.py

@@ -22,7 +22,7 @@
 logger = logging.getLogger(__name__)
 
 
-def logger_destroyed(log, obj):
+def logger_destroyed(log):
     """
     Callback invoked when the Widget is destroyed.
     This method is used to ensure that the log handlers are cleared.
@@ -31,9 +31,6 @@ def logger_destroyed(log, obj):
     ----------
     log : Logger
         The logger object being used by the PyDMLogDisplay widget.
-    obj : QWidget
-        The widget which is being destroyed. All childs of this widget are
-        already destroyed and must not be accessed.
     """
     if log:
         for handler in log.handlers: