Jun 7, 2022 · Jun 3, 2022 · Jun 3, 2022 · Jun 3, 2022 · Jun 3, 2022 · Jun 3, 2022
diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
   The version number of this module, as a string. This is not the version of
   the SQLite library.

   .. deprecated-removed:: 3.12 3.14
      This constant used to reflect the version number of the ``pysqlite``
      package, a third-party library which used to upstream changes to
      ``sqlite3``. Today, it carries no meaning or practical value.


 .. data:: version_info

   The version number of this module, as a tuple of integers. This is not the
   version of the SQLite library.

   .. deprecated-removed:: 3.12 3.14
      This constant used to reflect the version number of the ``pysqlite``
      package, a third-party library which used to upstream changes to
      ``sqlite3``. Today, it carries no meaning or practical value.


 .. data:: sqlite_version

diff --git a/Lib/sqlite3/__init__.py b/Lib/sqlite3/__init__.py
 """

 fromsqlite3.dbapi2import*
 fromsqlite3.dbapi2import (_deprecated_names,
 _deprecated_version_info,
 _deprecated_version)


 def__getattr__(name):
 ifnamein_deprecated_names:
 fromwarningsimportwarn

 warn(f"{name} is deprecated and will be removed in Python 3.14",
 DeprecationWarning,stacklevel=2)
 returnglobals()[f"_deprecated_{name}"]
 raiseAttributeError(f"module{__name__!r} has no attribute{name!r}")
diff --git a/Lib/sqlite3/dbapi2.py b/Lib/sqlite3/dbapi2.py
 importcollections.abc

 from_sqlite3import*
 from_sqlite3import_deprecated_version

 _deprecated_names=frozenset({"version","version_info"})

 paramstyle="qmark"

 defTimestampFromTicks(ticks):
 returnTimestamp(*time.localtime(ticks)[:6])

 version_info=tuple([int(x)forxinversion.split(".")])
 _deprecated_version_info=tuple(map(int,_deprecated_version.split(".")))
 sqlite_version_info=tuple([int(x)forxinsqlite_version.split(".")])

 Binary=memoryview
 # Clean up namespace

 del(register_adapters_and_converters)

 def__getattr__(name):
 ifnamein_deprecated_names:
 fromwarningsimportwarn

 warn(f"{name} is deprecated and will be removed in Python 3.14",
 DeprecationWarning,stacklevel=2)
 returnglobals()[f"_deprecated_{name}"]
 raiseAttributeError(f"module{__name__!r} has no attribute{name!r}")
diff --git a/Lib/test/test_sqlite3/test_dbapi.py b/Lib/test/test_sqlite3/test_dbapi.py
        self.assertEqual(sqlite.apilevel, "2.0",
                         "apilevel is %s, should be 2.0" % sqlite.apilevel)

    def test_deprecated_version(self):
        msg = "deprecated and will be removed in Python 3.14"
        for attr in "version", "version_info":
            with self.subTest(attr=attr):
                with self.assertWarnsRegex(DeprecationWarning, msg) as cm:
                    getattr(sqlite, attr)
                self.assertEqual(cm.filename,  __file__)
                with self.assertWarnsRegex(DeprecationWarning, msg) as cm:
                    getattr(sqlite.dbapi2, attr)
                self.assertEqual(cm.filename,  __file__)

    def test_thread_safety(self):
        self.assertIn(sqlite.threadsafety, {0, 1, 3},
                      "threadsafety is %d, should be 0, 1 or 3" %
diff --git a/Misc/ACKS b/Misc/ACKS
 Chris Rebert
 Marc Recht
 John Redford
 Kalyan Reddy
 Terry J. Reedy
 Gareth Rees
 John Reese
diff --git a/Misc/NEWS.d/next/Library/2022-06-03-22-13-28.gh-issue-93370.tjfu9L.rst b/Misc/NEWS.d/next/Library/2022-06-03-22-13-28.gh-issue-93370.tjfu9L.rst
 Deprecate :data:`sqlite3.version` and :data:`sqlite3.version_info`.
diff --git a/Modules/_sqlite/module.c b/Modules/_sqlite/module.c
        gotoerror;
    }

 if (PyModule_AddStringConstant(module,"version",PYSQLITE_VERSION)<0) {
 if (PyModule_AddStringConstant(module,"_deprecated_version",PYSQLITE_VERSION)<0) {
        gotoerror;
    }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -142,12 +142,22 @@ Module functions and constants
		The version number of this module, as a string. This is not the version of
		the SQLite library.

		.. deprecated-removed:: 3.12 3.14
		This constant used to reflect the version number of the ``pysqlite``
		package, a third-party library which used to upstream changes to
		``sqlite3``. Today, it carries no meaning or practical value.


		.. data:: version_info

		The version number of this module, as a tuple of integers. This is not the
		version of the SQLite library.

		.. deprecated-removed:: 3.12 3.14
		This constant used to reflect the version number of the ``pysqlite``
		package, a third-party library which used to upstream changes to
		``sqlite3``. Today, it carries no meaning or practical value.


		.. data:: sqlite_version

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -55,3 +55,16 @@
		"""

		fromsqlite3.dbapi2import*
		fromsqlite3.dbapi2import (_deprecated_names,
		_deprecated_version_info,
		_deprecated_version)


		def__getattr__(name):
		ifnamein_deprecated_names:
		fromwarningsimportwarn

		warn(f"{name} is deprecated and will be removed in Python 3.14",
rawwar marked this conversation as resolved. Show resolvedHide resolved
		DeprecationWarning,stacklevel=2)
		returnglobals()[f"_deprecated_{name}"]
		raiseAttributeError(f"module{__name__!r} has no attribute{name!r}")
erlend-aasland marked this conversation as resolved. Show resolvedHide resolved
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,6 +25,9 @@
		importcollections.abc

		from_sqlite3import*
		from_sqlite3import_deprecated_version

		_deprecated_names=frozenset({"version","version_info"})

		paramstyle="qmark"

Expand All		@@ -45,7 +48,7 @@ def TimeFromTicks(ticks):
		defTimestampFromTicks(ticks):
		returnTimestamp(*time.localtime(ticks)[:6])

		version_info=tuple([int(x)forxinversion.split(".")])
		_deprecated_version_info=tuple(map(int,_deprecated_version.split(".")))
		sqlite_version_info=tuple([int(x)forxinsqlite_version.split(".")])

		Binary=memoryview
Expand DownExpand Up		@@ -85,3 +88,12 @@ def convert_timestamp(val):
		# Clean up namespace

		del(register_adapters_and_converters)

		def__getattr__(name):
		ifnamein_deprecated_names:
		fromwarningsimportwarn

		warn(f"{name} is deprecated and will be removed in Python 3.14",
rawwar marked this conversation as resolved. Show resolvedHide resolved
		DeprecationWarning,stacklevel=2)
		returnglobals()[f"_deprecated_{name}"]
		raiseAttributeError(f"module{__name__!r} has no attribute{name!r}")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -57,6 +57,17 @@ def test_api_level(self):
		self.assertEqual(sqlite.apilevel, "2.0",
		"apilevel is %s, should be 2.0" % sqlite.apilevel)

		def test_deprecated_version(self):
		msg = "deprecated and will be removed in Python 3.14"
		for attr in "version", "version_info":
		with self.subTest(attr=attr):
		with self.assertWarnsRegex(DeprecationWarning, msg) as cm:
		getattr(sqlite, attr)
		self.assertEqual(cm.filename, __file__)
		with self.assertWarnsRegex(DeprecationWarning, msg) as cm:
		getattr(sqlite.dbapi2, attr)
		self.assertEqual(cm.filename, __file__)

		def test_thread_safety(self):
		self.assertIn(sqlite.threadsafety, {0, 1, 3},
		"threadsafety is %d, should be 0, 1 or 3" %
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1455,6 +1455,7 @@ Edward K. Ream
		Chris Rebert
		Marc Recht
		John Redford
		Kalyan Reddy
		Terry J. Reedy
		Gareth Rees
		John Reese
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Deprecate :data:`sqlite3.version` and :data:`sqlite3.version_info`.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -707,7 +707,7 @@ module_exec(PyObject *module)
		gotoerror;
		}

		if (PyModule_AddStringConstant(module,"version",PYSQLITE_VERSION)<0) {
		if (PyModule_AddStringConstant(module,"_deprecated_version",PYSQLITE_VERSION)<0) {
		gotoerror;
		}

Expand Down