Nov 17, 2020 · Nov 4, 2020 · Nov 5, 2020 · Nov 5, 2020 · Nov 5, 2020 · Nov 5, 2020
diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst
  as appropriate to help identify code which needs updating during
  this transition.

 * ``sqlite3.OptimizedUnicode`` has been undocumented and obsolete since Python
  3.3, when it was made an alias to :class:`str`.  It is now deprecated,
  scheduled for removal in Python 3.12.
  (Contributed by Erlend E. Aasland in :issue:`42264`.)


 Removed
 =======
diff --git a/Lib/sqlite3/__init__.py b/Lib/sqlite3/__init__.py
 # 3. This notice may not be removed or altered from any source distribution.

 from sqlite3.dbapi2 import *


 # bpo-42264: OptimizedUnicode was deprecated in Python 3.10.  It's scheduled
 # for removal in Python 3.12.
 def __getattr__(name):
    if name == "OptimizedUnicode":
        import warnings
        msg = ("""
            OptimizedUnicode is deprecated and will be removed in Python 3.12.
            Since Python 3.3 it has simply been an alias for 'str'.
        """)
        warnings.warn(msg, DeprecationWarning, stacklevel=2)
        return str
    raise AttributeError(f"module 'sqlite3' has no attribute '{name}'")
diff --git a/Lib/sqlite3/test/factory.py b/Lib/sqlite3/test/factory.py
        self.assertTrue(row[0].endswith("reich"), "column must contain original data")

    def CheckOptimizedUnicode(self):
        # In py3k, str objects are always returned when text_factory
        # is OptimizedUnicode
        self.con.text_factory = sqlite.OptimizedUnicode
        # OptimizedUnicode is deprecated as of Python 3.10
        with self.assertWarns(DeprecationWarning) as cm:
            self.con.text_factory = sqlite.OptimizedUnicode
        self.assertIn("factory.py", cm.filename)
        austria = "�sterreich"
        germany = "Deutchland"
        a_row = self.con.execute("select ?", (austria,)).fetchone()
diff --git a/Misc/NEWS.d/next/Library/2020-11-05-13-32-41.bpo-42264.r4KYUU.rst b/Misc/NEWS.d/next/Library/2020-11-05-13-32-41.bpo-42264.r4KYUU.rst
 ``sqlite3.OptimizedUnicode`` has been undocumented and obsolete since Python
 3.3, when it was made an alias to :class:`str`.  It is now deprecated,
 scheduled for removal in Python 3.12.
diff --git a/Modules/_sqlite/module.c b/Modules/_sqlite/module.c
    ADD_EXCEPTION(module, "DataError", pysqlite_DataError, pysqlite_DatabaseError);
    ADD_EXCEPTION(module, "NotSupportedError", pysqlite_NotSupportedError, pysqlite_DatabaseError);

    /* In Python 2.x, setting Connection.text_factory to
       OptimizedUnicode caused Unicode objects to be returned for
       non-ASCII data and bytestrings to be returned for ASCII data.
       Now OptimizedUnicode is an alias for str, so it has no
       effect. */
    if (PyModule_AddObjectRef(module, "OptimizedUnicode", (PyObject*)&PyUnicode_Type) < 0) {
        goto error;
    }

    /* Set integer constants */
    if (add_integer_constants(module) < 0) {
        goto error;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -299,6 +299,11 @@ Deprecated
		as appropriate to help identify code which needs updating during
		this transition.

		* ``sqlite3.OptimizedUnicode`` has been undocumented and obsolete since Python
		3.3, when it was made an alias to :class:`str`. It is now deprecated,
		scheduled for removal in Python 3.12.
		(Contributed by Erlend E. Aasland in :issue:`42264`.)


		Removed
		=======
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,3 +21,17 @@
		# 3. This notice may not be removed or altered from any source distribution.

		from sqlite3.dbapi2 import *


		# bpo-42264: OptimizedUnicode was deprecated in Python 3.10. It's scheduled
		# for removal in Python 3.12.
		def __getattr__(name):
		if name == "OptimizedUnicode":
		import warnings
		msg = ("""
		OptimizedUnicode is deprecated and will be removed in Python 3.12.
		Since Python 3.3 it has simply been an alias for 'str'.
		""")
		warnings.warn(msg, DeprecationWarning, stacklevel=2)
		return str
		raise AttributeError(f"module 'sqlite3' has no attribute '{name}'")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -254,9 +254,10 @@ def CheckCustom(self):
		self.assertTrue(row[0].endswith("reich"), "column must contain original data")

		def CheckOptimizedUnicode(self):
		# In py3k, str objects are always returned when text_factory
		# is OptimizedUnicode
		self.con.text_factory = sqlite.OptimizedUnicode
		# OptimizedUnicode is deprecated as of Python 3.10
		with self.assertWarns(DeprecationWarning) as cm:
		self.con.text_factory = sqlite.OptimizedUnicode
		self.assertIn("factory.py", cm.filename)
		austria = "�sterreich"
		germany = "Deutchland"
		a_row = self.con.execute("select ?", (austria,)).fetchone()
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		``sqlite3.OptimizedUnicode`` has been undocumented and obsolete since Python
		3.3, when it was made an alias to :class:`str`. It is now deprecated,
		scheduled for removal in Python 3.12.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -412,15 +412,6 @@ PyMODINIT_FUNC PyInit__sqlite3(void)
		ADD_EXCEPTION(module, "DataError", pysqlite_DataError, pysqlite_DatabaseError);
		ADD_EXCEPTION(module, "NotSupportedError", pysqlite_NotSupportedError, pysqlite_DatabaseError);

		/* In Python 2.x, setting Connection.text_factory to
		OptimizedUnicode caused Unicode objects to be returned for
		non-ASCII data and bytestrings to be returned for ASCII data.
		Now OptimizedUnicode is an alias for str, so it has no
		effect. */
		if (PyModule_AddObjectRef(module, "OptimizedUnicode", (PyObject*)&PyUnicode_Type) < 0) {
		goto error;
		}

		/* Set integer constants */
		if (add_integer_constants(module) < 0) {
		goto error;
Expand Down