Commit1a1bfc2

authored

pythongh-105539: Emit ResourceWarning if sqlite3 database is not closed explicitly (python#108015)

1 parent8661751 commit1a1bfc2Copy full SHA for 1a1bfc2

File tree

+30

-0

lines changed

+30

-0

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -630,6 +630,12 @@ Connection objects`
`630`	`630`	*:ref:`sqlite3-connection-shortcuts`
`631`	`631`	*:ref:`sqlite3-connection-context-manager`
`632`	`632`
	`633`	`+`
	`634`	`+ ..versionchanged::3.13`
	`635`	`+`
	`636`	+ A:exc:`ResourceWarning` is emitted if:meth:`close` is not called before
	`637`	+ a:class:`!Connection` object is deleted.
	`638`	`+`
`633`	`639`	`An SQLite database connection has the following attributes and methods:`
`634`	`640`
`635`	`641`	`..method::cursor(factory=Cursor)`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,13 @@ pathlib`
`158`	`158`	:meth:`~pathlib.Path.is_dir`.
`159`	`159`	(Contributed by Barney Gale in:gh:`77609` and:gh:`105793`.)
`160`	`160`
	`161`	`+sqlite3`
	`162`	`+-------`
	`163`	`+`
	`164`	+* A:exc:`ResourceWarning` is now emitted if a:class:`sqlite3.Connection`
	`165`	+ object is not:meth:`closed <sqlite3.Connection.close>` explicitly.
	`166`	+ (Contributed by Erlend E. Aasland in:gh:`105539`.)
	`167`	`+`
`161`	`168`	`tkinter`
`162`	`169`	`-------`
`163`	`170`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -583,6 +583,12 @@ def test_connect_positional_arguments(self):`
`583`	`583`	`cx.close()`
`584`	`584`	`self.assertEqual(cm.filename,__file__)`
`585`	`585`
	`586`	`+deftest_connection_resource_warning(self):`
	`587`	`+withself.assertWarns(ResourceWarning):`
	`588`	`+cx=sqlite.connect(":memory:")`
	`589`	`+delcx`
	`590`	`+gc_collect()`
	`591`	`+`
`586`	`592`
`587`	`593`	`classUninitialisedConnectionTests(unittest.TestCase):`
`588`	`594`	`defsetUp(self):`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+:mod:`sqlite3` now emits an:exc:`ResourceWarning` if a
	`2`	+:class:`sqlite3.Connection` object is not:meth:`closed
	`3`	+<sqlite3.connection.close>` explicitly. Patch by Erlend E. Aasland.

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -493,6 +493,14 @@ connection_finalize(PyObject *self)`
`493`	`493`	`}`
`494`	`494`
`495`	`495`	`/* Clean up if user has not called .close() explicitly. */`
	`496`	`+if (con->db) {`
	`497`	`+if (PyErr_ResourceWarning(self,1,"unclosed database in %R",self)) {`
	`498`	`+/* Spurious errors can appear at shutdown */`
	`499`	`+if (PyErr_ExceptionMatches(PyExc_Warning)) {`
	`500`	`+PyErr_WriteUnraisable(self);`
	`501`	`+ }`
	`502`	`+ }`
	`503`	`+ }`
`496`	`504`	`if (connection_close(con)<0) {`
`497`	`505`	`if (teardown) {`
`498`	`506`	`PyErr_Clear();`

Comments

(0)