Skip to content

gh-108590: Fix sqlite3.iterdump for invalid unicode in text columns. #108657

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
erlend-aasland merged 7 commits into from
Aug 30, 2023
Merged

gh-108590: Fix sqlite3.iterdump for invalid unicode in text columns. #108657

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a689bbd
gh-108590: Fix sqlite3.iterdump for invalid unicode in text columns.
CorvinM Aug 29, 2023
03f41df
📜🤖 Added by blurb_it.
blurb-it[bot] Aug 29, 2023
e2939d5
Update Misc/NEWS.d/next/Library/2023-08-29-22-53-48.gh-issue-108590.6…
CorvinM Aug 30, 2023
0643ffc
Update Lib/sqlite3/dump.py
CorvinM Aug 30, 2023
608d919
Address comments
CorvinM Aug 30, 2023
cc7fba8
Use contextmanager
CorvinM Aug 30, 2023
c1b730d
Style nits and a comment
erlend-aasland Aug 30, 2023
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
Use contextmanager
  • Loading branch information
@CorvinM
CorvinM committed Aug 30, 2023
commit cc7fba8aa17e7a7cece54f87111d3f56967a43f0
24 changes: 11 additions & 13 deletions Lib/sqlite3/dump.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
# future enhancements, you should normally quote any identifier that
# is an English language word, even if you do not have to."

from contextlib import contextmanager

def _quote_name(name):
return '"{0}"'.format(name.replace('"', '""'))

Expand All @@ -20,18 +22,14 @@ def _force_decode(bs, *args, **kwargs):
except UnicodeDecodeError:
return "".join([chr(c) for c in bs])

class _ctx_text_factory:
def __init__(self, connection, text_factory):
self.connection = connection
self.text_factory = text_factory
self.orig_text_factory = None

def __enter__(self):
self.orig_text_factory = self.connection.text_factory
self.connection.text_factory = self.text_factory

def __exit__(self, type, value, tb):
self.connection.text_factory = self.orig_text_factory
@contextmanager
def _text_factory(con, factory):
saved_factory = con.text_factory
con.text_factory = factory
try:
yield
finally:
con.text_factory = saved_factory

def _iterdump(connection):
"""
Expand Down Expand Up @@ -92,7 +90,7 @@ def _iterdump(connection):
)
)
query_res = cu.execute(q)
with _ctx_text_factory(connection, bytes):
with _text_factory(connection, bytes):
for row in query_res:
yield("{0};".format(_force_decode(row[0])))
Comment thread
CorvinM marked this conversation as resolved.

Expand Down