Skip to content

Keep references for __del__ #1

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

Open
apt-shansen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Keep references for __del__ #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 12 additions & 9 deletions siding/singleinstance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,12 @@ def __init__(self, *args, **kwargs):

QApplication.__init__(self, *args, **kwargs)

# During shutdown, we can't rely on globals like os being still available.
if os.name == "nt":
self._close_lock = self._close_mutex
else:
self._close_lock = self._close_lockfile

# If this is Windows, then _aeroglass is imported already, so hook up
# to that.
if _aeroglass:
Expand All @@ -132,11 +138,8 @@ def __del__(self):
Close the handle of our mutex if we have one, destroy any existing lock
file, any gracefully close the QLocalServer.
"""
if os.name == 'nt':
self._close_mutex()
else:
self._close_lockfile()

self._close_lock()
self._close_server()

##### Event Filtering #####################################################
Expand Down Expand Up @@ -235,12 +238,12 @@ def _build_app_id(self):

##### Mutex Code ##########################################################

def _close_mutex(self):
def _close_mutex(self, CloseHandle=windll.kernel32.CloseHandle):
"""
If we have a mutex, try to close it.
"""
if self._mutex:
windll.kernel32.CloseHandle(self._mutex)
CloseHandle(self._mutex)
self._mutex = None

def _create_mutex(self):
Expand All @@ -256,13 +259,13 @@ def _create_mutex(self):

##### Lockfile Code #######################################################

def _close_lockfile(self):
def _close_lockfile(self, unlink=os.unlink, close=os.close):
"""
If a lockfile exists, delete it.
"""
if self._lockfile:
os.unlink(self._lockfile)
os.close(self._lockfd)
unlink(self._lockfile)
close(self._lockfd)
self._lockfile = None
self._lockfd = None

Expand Down