Skip to content

bpo-42264: Deprecate sqlite3.OptimizedUnicode #23163

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 11 commits into from
Nov 17, 2020
Merged

bpo-42264: Deprecate sqlite3.OptimizedUnicode #23163

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
af2c7e5
Deprecate OptimizedUnicode
Nov 4, 2020
f8dfb6d
Add NEWS and update "What's new"
Nov 5, 2020
f25e85a
Restore type checks in unit test
Nov 5, 2020
a9e959f
Address review comment: Refer to caller when warning, and verify this
Nov 5, 2020
3cd247f
Address review: Improve NEWS text
Nov 5, 2020
b106c9e
Address review: improve "What's new"
Nov 5, 2020
b364cf5
Address review: Move deprecation warning to __init__.py
Nov 5, 2020
3320b42
Restore dbapi2 import in __init__.py
Nov 5, 2020
62d2e9b
Improve warning wording
Nov 5, 2020
2507fd0
Address review comment: Improve NEWS entry
Nov 6, 2020
fe7c65e
Address review comment: Add bpo reference to __init__.py
Nov 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Address review comment: Refer to caller when warning, and verify this
  • Loading branch information
Erlend E. Aasland committed Nov 5, 2020
commit a9e959f63bfc2d5aec21ca57e713dd549411a139
2 changes: 1 addition & 1 deletion Lib/sqlite3/deprecated.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ def __getattr__(name):
OptimizedUnicode is obsolete. You can safely remove it from your
code, as it defaults to 'str' anyway.
""")
warnings.warn(msg, DeprecationWarning)
warnings.warn(msg, DeprecationWarning, stacklevel=2)
return str
raise AttributeError(f"module 'sqlite3' has no attribute '{name}'")
3 changes: 2 additions & 1 deletion Lib/sqlite3/test/factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,9 @@ def CheckCustom(self):

def CheckOptimizedUnicode(self):
# OptimizedUnicode is deprecated as of Python 3.10
with self.assertWarns(DeprecationWarning):
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