Skip to content

Fix at-exit cleanup to avoid the GIL error #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbillinge merged 2 commits into from
Aug 16, 2024
Merged

Fix at-exit cleanup to avoid the GIL error #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bcc847
Use atexit for cleanup of Python-extended prototypes
pavoljuhas Aug 15, 2024
3a201f2
Fix test error on removed numpy.complex
pavoljuhas Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/diffpy/srreal/_cleanup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class prototypes is implemented in libdiffpy. Any Python-extended classes
"""


import atexit
import weakref


Expand Down Expand Up @@ -62,7 +63,7 @@ def add(self, obj):
return


def __del__(self):
def clean(self):
while self._references:
wr = self._references.pop()
obj = wr()
Expand All @@ -75,7 +76,8 @@ def __del__(self):

# create singleton instance of the cleanup handler
_cleanup_handler = _DerivedClassesCleanUpHandler()
del _DerivedClassesCleanUpHandler
atexit.register(_cleanup_handler.clean)

del _DerivedClassesCleanUpHandler

# End of file.
2 changes: 1 addition & 1 deletion src/diffpy/srreal/tests/testpairquantity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def test_setPairMask_args(self):
spm = self.pq.setPairMask
gpm = self.pq.getPairMask
self.assertRaises(TypeError, spm, 0.0, 0, False)
self.assertRaises(TypeError, spm, numpy.complex(0.5), 0, False)
self.assertRaises(TypeError, spm, complex(0.5), 0, False)
self.assertTrue(gpm(0, 0))
spm(numpy.int32(1), 0, True, others=False)
self.assertTrue(gpm(0, 1))
Expand Down