Skip to content

bpo-34052: Prevent SQLite functions from setting callbacks on exceptions.#8113

Merged
serhiy-storchaka merged 6 commits into
python:masterfrom
sir-sigurd:sqlite-callbacks
Dec 5, 2018
Merged

bpo-34052: Prevent SQLite functions from setting callbacks on exceptions.#8113
serhiy-storchaka merged 6 commits into
python:masterfrom
sir-sigurd:sqlite-callbacks

Conversation

@sir-sigurd
Copy link
Copy Markdown
Contributor

@sir-sigurd sir-sigurd commented Jul 5, 2018 •
edited by bedevere-bot
Loading

@serhiy-storchaka serhiy-storchaka self-requested a review July 5, 2018 10:54
serhiy-storchaka
serhiy-storchaka reviewed Jul 15, 2018
View reviewed changes
Comment thread Modules/_sqlite/connection.c Outdated
@serhiy-storchaka serhiy-storchaka added type-bug An unexpected behavior, bug, or error needs backport to 3.6 labels Jul 15, 2018
@serhiy-storchaka
Copy link
Copy Markdown
Member

serhiy-storchaka commented Jul 16, 2018

Would be nice to add tests and a news entry.

And needed to merge with master.

serhiy-storchaka
serhiy-storchaka reviewed Jul 24, 2018
View reviewed changes
Comment thread Lib/sqlite3/test/userfunctions.py Outdated
@sir-sigurd
Copy link
Copy Markdown
Contributor Author

sir-sigurd commented Nov 21, 2018

@serhiy-storchaka, could you review this again, please?

@serhiy-storchaka serhiy-storchaka merged commit 5b25f1d into python:master Dec 5, 2018
@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Dec 5, 2018

Thanks @sir-sigurd for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 2.7, 3.6, 3.7.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Dec 5, 2018

Sorry, @sir-sigurd and @serhiy-storchaka, I could not cleanly backport this to 3.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 5b25f1d03100e2283c1b129d461ba68ac0169a14 3.7

@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Dec 5, 2018

Sorry, @sir-sigurd and @serhiy-storchaka, I could not cleanly backport this to 3.6 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 5b25f1d03100e2283c1b129d461ba68ac0169a14 3.6

@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Dec 5, 2018

Sorry, @sir-sigurd and @serhiy-storchaka, I could not cleanly backport this to 2.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 5b25f1d03100e2283c1b129d461ba68ac0169a14 2.7

serhiy-storchaka pushed a commit to serhiy-storchaka/cpython that referenced this pull request Dec 5, 2018
@sir-sigurd @serhiy-storchaka
[3.7] bpo-34052: Prevent SQLite functions from setting callbacks on e…
67d544f 
…xceptions. (pythonGH-8113).

(cherry picked from commit 5b25f1d)

Co-authored-by: Sergey Fedoseev <fedoseev.sergey@gmail.com>
@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Dec 5, 2018

GH-10946 is a backport of this pull request to the 3.7 branch.

serhiy-storchaka added a commit that referenced this pull request Dec 5, 2018
@serhiy-storchaka @sir-sigurd
bpo-34052: Prevent SQLite functions from setting callbacks on excepti…
1de91a0 
…ons. (GH-8113). (GH-10946)

(cherry picked from commit 5b25f1d)

Co-authored-by: Sergey Fedoseev <fedoseev.sergey@gmail.com>
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Dec 5, 2018
@serhiy-storchaka @miss-islington
bpo-34052: Prevent SQLite functions from setting callbacks on excepti…
79722ae 
…ons. (pythonGH-8113). (pythonGH-10946)

(cherry picked from commit 5b25f1d)

Co-authored-by: Sergey Fedoseev <fedoseev.sergey@gmail.com>
(cherry picked from commit 1de91a0)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
serhiy-storchaka added a commit to serhiy-storchaka/cpython that referenced this pull request Dec 5, 2018
@serhiy-storchaka
[2.7] bpo-34052: Prevent SQLite functions from setting callbacks on e…
409fbdd 
…xceptions. (pythonGH-8113). (pythonGH-10946)

(cherry picked from commit 5b25f1d)

Co-authored-by: Sergey Fedoseev <fedoseev.sergey@gmail.com>.
(cherry picked from commit 1de91a0)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
serhiy-storchaka pushed a commit that referenced this pull request Dec 5, 2018
@miss-islington @sir-sigurd @serhiy-storchaka
bpo-34052: Prevent SQLite functions from setting callbacks on excepti…
fdf5050 
…ons. (GH-8113). (GH-10946) (GH-10952)

(cherry picked from commit 5b25f1d)
(cherry picked from commit 1de91a0)

Co-authored-by: Sergey Fedoseev <fedoseev.sergey@gmail.com>
@serhiy-storchaka serhiy-storchaka removed their assignment Dec 5, 2018
serhiy-storchaka added a commit that referenced this pull request Dec 5, 2018
@serhiy-storchaka
[2.7] bpo-34052: Prevent SQLite functions from setting callbacks on e…
fff8fab 
…xceptions. (GH-8113). (GH-10946) (GH-10955)

(cherry picked from commit 5b25f1d)
(cherry picked from commit 1de91a0)

Co-authored-by: Sergey Fedoseev <fedoseev.sergey@gmail.com>.
@sir-sigurd sir-sigurd deleted the sqlite-callbacks branch December 6, 2018 03:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@serhiy-storchaka serhiy-storchaka serhiy-storchaka approved these changes

Assignees

No one assigned

Labels

type-bug An unexpected behavior, bug, or error

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@sir-sigurd @serhiy-storchaka @miss-islington @bedevere-bot @the-knights-who-say-ni