Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork32.4k
gh-105539: Emit ResourceWarning if sqlite3 database is not closed explicitly#108015
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
erlend-aasland merged 12 commits intopython:mainfromerlend-aasland:sqlite/resource-warningAug 22, 2023
+30 −0
Merged
Changes fromall commits
Commits
Show all changes
12 commits Select commitHold shift + click to select a range
4a8d209
gh-105539: Emit ResourceWarning if sqlite3 database is not closed exp…
erlend-aaslandc00bdcf
Fix Sphinx warning
erlend-aasland8075485
Pull in main
erlend-aaslanda12b7a4
Add back test
erlend-aaslandd102ea0
Fix indent
erlend-aaslandc573f15
Pull in main
erlend-aasland8ebc8a7
Address review: move finalizing check from the close helper to the fi…
erlend-aaslandb67a3c0
Fix pointer deref and move exception guard
erlend-aasland980d4d2
Slightly more informative error message
erlend-aasland03a034d
Only remove callbacks if there is a database to close
erlend-aasland6f6cd82
Pull in main
erlend-aasland744bd1d
Fix merge
erlend-aaslandFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletionsDoc/whatsnew/3.13.rst
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -583,6 +583,12 @@ def test_connect_positional_arguments(self): | ||
cx.close() | ||
self.assertEqual(cm.filename, __file__) | ||
def test_connection_resource_warning(self): | ||
with self.assertWarns(ResourceWarning): | ||
cx = sqlite.connect(":memory:") | ||
del cx | ||
gc_collect() | ||
erlend-aasland marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
class UninitialisedConnectionTests(unittest.TestCase): | ||
def setUp(self): | ||
3 changes: 3 additions & 0 deletionsMisc/NEWS.d/next/Library/2023-08-16-14-30-13.gh-issue-105539.29lA6c.rst
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
:mod:`sqlite3` now emits an :exc:`ResourceWarning` if a | ||
:class:`sqlite3.Connection` object is not :meth:`closed | ||
<sqlite3.connection.close>` explicitly. Patch by Erlend E. Aasland. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -493,6 +493,14 @@ connection_finalize(PyObject *self) | ||
} | ||
/* Clean up if user has not called .close() explicitly. */ | ||
if (con->db) { | ||
if (PyErr_ResourceWarning(self, 1, "unclosed database in %R", self)) { | ||
/* Spurious errors can appear at shutdown */ | ||
if (PyErr_ExceptionMatches(PyExc_Warning)) { | ||
erlend-aasland marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
PyErr_WriteUnraisable(self); | ||
erlend-aasland marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
} | ||
} | ||
} | ||
if (connection_close(con) < 0) { | ||
if (teardown) { | ||
PyErr_Clear(); | ||
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.