voussoir/etiquette
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add hasattr checks to prevent faulty __del__.

Browse source
This commit is contained in:
voussoir 2018-03-13 02:20:17 -07:00
parent 5b310e6d7c
commit b89da5dec2
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
etiquette/photodb.py
View file

@ -706,7 +706,13 @@ class PDBSQLMixin:
self.savepoints = [] self.savepoints = []
def close(self): def close(self):
# Wrapped in hasattr because if the object fails __init__, Python will
# still call __del__ and thus close(), even though the attributes
# we're trying to clean up never got set.
if hasattr(self, 'sql'):
self.sql.close() self.sql.close()
if hasattr(self, 'ephemeral'):
if self.ephemeral: if self.ephemeral:
self.ephemeral_directory.cleanup() self.ephemeral_directory.cleanup()