Repository navigation
fix: remove dead _disconnect hooks on QModelMenu/QModelToolBar - #291
Merged
Merged
Conversation
`destroyed.connect(self._disconnect)` never actually fires. It isn't needed: psygnal holds the slot weakly, so the connection goes away when the python wrapper is collected. Also suppress RuntimeError in QModelToolBar._on_registry_changed (as QModelMenu already does), for the case where the C++ object is deleted but the wrapper is still alive. closes pyapp-kit#157
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #291 +/- ##
==========================================
- Coverage 99.49% 99.49% -0.01%
==========================================
Files 31 31
Lines 1975 1970 -5
==========================================
- Hits 1965 1960 -5
Misses 10 10 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
closes #157
as described in #157, the
self.destroyed.connect(self._disconnect)hookups onQModelMenuandQModelToolBarnever actually get called (on PyQt6 or PySide6). It turns out we don't need them though... psygnal only holds a weak ref to_on_registry_changed, so the connection cleans itself up once the python wrapper is garbage collected. So this just removes the dead code.The one case that can still bite is when the C++ object has been deleted but something still holds a reference to the python wrapper (so the slot is still connected).
QModelMenualready handles that by suppressing theRuntimeErrorin_on_registry_changed(from #151), butQModelToolBardidn't, andmenus_changed.emit()would raise anEmitLoopError. This adds the same suppression to the toolbar, plus a test for both.