Skip to content

Commit 2cab9ba

Browse files
CopilotPhBouzid
andcommitted
fix: remove APSW cursor context managers (not supported)
Co-authored-by: PhBouzid <15084032+PhBouzid@users.noreply.github.com>
1 parent 129dec4 commit 2cab9ba

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

src/db.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ def __create_connection(db_file):
7070
def __create_table(self, query):
7171
try:
7272
cursor = self.__conn.cursor()
73-
with cursor:
74-
cursor.execute(query)
73+
cursor.execute(query)
7574
except apsw.Error as err:
7675
log.exception("Database Error: %s" % err)
7776
return 0
@@ -82,37 +81,37 @@ def __log_and_execute(self, cursor, sql, args):
8281
cursor.execute(sql, args)
8382

8483
def __insert_or_delete(self, query, params, login=False):
84+
conn = None
8585
try:
8686
if login:
8787
conn = DB.__create_connection(self.__dbfile)
8888
cursor = conn.cursor()
8989
else:
9090
cursor = self.__conn.cursor()
91-
with cursor:
92-
self.__log_and_execute(cursor, query, params)
91+
self.__log_and_execute(cursor, query, params)
9392
return 1
9493
except apsw.Error as err:
9594
log.exception("Database Error: %s" % err)
9695
return 0
9796
finally:
98-
if login and 'conn' in locals():
97+
if conn is not None:
9998
conn.close()
10099

101100
def __select(self, query, params, login=False):
101+
conn = None
102102
try:
103103
if login:
104104
conn = DB.__create_connection(self.__dbfile)
105105
cursor = conn.cursor()
106106
else:
107107
cursor = self.__conn.cursor()
108-
with cursor:
109-
self.__log_and_execute(cursor, query, params)
110-
return cursor.fetchall()
108+
self.__log_and_execute(cursor, query, params)
109+
return cursor.fetchall()
111110
except apsw.Error as err:
112111
log.exception("Database Error: %s" % err)
113112
return None
114113
finally:
115-
if login and 'conn' in locals():
114+
if conn is not None:
116115
conn.close()
117116

118117
def update_job(self, task_id, type, status, vault, error, login=False):

test.db

Whitespace-only changes.

0 commit comments

Comments
 (0)