Skip to content

Commit c699443

Browse files
committed
Minor improvement in determining thread safety
1 parent 3ba9f49 commit c699443

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

dbutils/persistent_db.py

+8-5
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,15 @@ def __init__(
174174
threadsafety = creator.threadsafety
175175
except AttributeError:
176176
try:
177-
if not callable(creator.connect):
178-
raise AttributeError
177+
threadsafety = creator.dbapi.threadsafety
179178
except AttributeError:
180-
threadsafety = 1
181-
else:
182-
threadsafety = 0
179+
try:
180+
if not callable(creator.connect):
181+
raise AttributeError
182+
except AttributeError:
183+
threadsafety = 1
184+
else:
185+
threadsafety = 0
183186
if not threadsafety:
184187
raise NotSupportedError("Database module is not thread-safe.")
185188
self._creator = creator

dbutils/pooled_db.py

+8-5
Original file line numberDiff line numberDiff line change
@@ -224,12 +224,15 @@ def __init__(
224224
threadsafety = creator.threadsafety
225225
except AttributeError:
226226
try:
227-
if not callable(creator.connect):
228-
raise AttributeError
227+
threadsafety = creator.dbapi.threadsafety
229228
except AttributeError:
230-
threadsafety = 2
231-
else:
232-
threadsafety = 0
229+
try:
230+
if not callable(creator.connect):
231+
raise AttributeError
232+
except AttributeError:
233+
threadsafety = 1
234+
else:
235+
threadsafety = 0
233236
if not threadsafety:
234237
raise NotSupportedError("Database module is not thread-safe.")
235238
self._creator = creator

0 commit comments

Comments
 (0)