Skip to content

gh-95132: Correctly relay *args and **kwds from sqlite3.connect to factory - #95146

Merged
erlend-aasland merged 9 commits into
python:mainfrom
erlend-aasland:sqlite-ac-connect
Jul 23, 2022
Merged

gh-95132: Correctly relay *args and **kwds from sqlite3.connect to factory#95146
erlend-aasland merged 9 commits into
python:mainfrom
erlend-aasland:sqlite-ac-connect

Conversation

@erlend-aasland

@erlend-aaslanderlend-aasland commented Jul 22, 2022•
edited
Loading

Copy link
Copy Markdown
Contributor

This PR partially reverts gh-24421 (PR) and fixes the remaining concerns
given in gh-93044 (issue).

Fixesgh-95132

@erlend-aaslanderlend-aasland mentioned this pull request Jul 22, 2022
Closed
@erlend-aasland
erlend-aasland marked this pull request as ready for review July 22, 2022 20:13
@erlend-aaslanderlend-aasland added the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Jul 22, 2022
@bedevere-bot

bedevere-bot commented Jul 22, 2022

Copy link
Copy Markdown

🤖 New build scheduled with the buildbot fleet by @erlend-aasland for commit b144689 🤖

If you want to schedule another build, you need to add the ":hammer: test-with-buildbots" label again.

@bedevere-botbedevere-bot removed the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Jul 22, 2022
@erlend-aasland

erlend-aasland commented Jul 22, 2022

Copy link
Copy Markdown
ContributorAuthor

Triggering the bots to be 100% sure we don't break 3.11 again.

@erlend-aasland

erlend-aasland commented Jul 22, 2022

Copy link
Copy Markdown
ContributorAuthor

I've queued a commit that further improves the factory tests. I'll wait until the bots are done before pushing it, though 🤖

@erlend-aaslanderlend-aasland added the needs backport to 3.11 only security fixes label Jul 22, 2022
@erlend-aasland

erlend-aasland commented Jul 23, 2022•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

I've queued a commit that further improves the factory tests. I'll wait until the bots are done before pushing it, though 🤖

Bot run: 87 successful and 1 skipped checks 💯

serhiy-storchaka
serhiy-storchaka reviewed Jul 23, 2022
View reviewed changes
Comment threadModules/_sqlite/module.c Outdated
serhiy-storchaka
serhiy-storchaka approved these changes Jul 23, 2022
View reviewed changes

@serhiy-storchakaserhiy-storchaka left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but <unrepresentable> makes the exact signature almost useless. And there is no need to use it, because the default value can be represented.

@erlend-aasland

erlend-aasland commented Jul 23, 2022

Copy link
Copy Markdown
ContributorAuthor

LGTM, but <unrepresentable> makes the exact signature almost useless. And there is no need to use it, because the default value can be represented.

Thanks for reviewing! Yeah, that's a C&P artefact from the clinic generated docstring. I'll fix it. Thanks again!

@erlend-aasland

erlend-aasland commented Jul 23, 2022•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

This PR also addresses the remaining concerns in #93044:

  1. Keyword arguments are passed as positional arguments to factory().
  2. If an argument is not passed to sqlite3.connect(), its default value is passed to factory().

@serhiy-storchaka

serhiy-storchaka commented Jul 23, 2022

Copy link
Copy Markdown
Member

Both the second and the third concerns.

serhiy-storchaka
serhiy-storchaka reviewed Jul 23, 2022
View reviewed changes
Comment threadModules/_sqlite/module.c Outdated
Erlend Egeberg Aasland@serhiy-storchaka
Update Modules/_sqlite/module.c
ca41429
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
@erlend-aasland

erlend-aasland commented Jul 23, 2022

Copy link
Copy Markdown
ContributorAuthor

Both the second and the third concerns.

Yes, I've already updated my post. Also thanks for the last got'cha.

@erlend-aasland
erlend-aasland merged commit a3d4d15 into python:mainJul 23, 2022
@miss-islington

miss-islington commented Jul 23, 2022

Copy link
Copy Markdown
Contributor

Thanks @erlend-aasland for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

@erlend-aasland
erlend-aasland deleted the sqlite-ac-connect branch July 23, 2022 07:51
@miss-islington

miss-islington commented Jul 23, 2022

Copy link
Copy Markdown
Contributor

Sorry, @erlend-aasland, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker a3d4d15f53777662ce0957500e5a538ce7161f5e 3.11

erlend-aasland pushed a commit to erlend-aasland/cpython that referenced this pull request Jul 23, 2022
Erlend Egeberg Aasland@erlend-aasland
[3.11]pythongh-95132: Correctly relay *args and **kwds from sqlite3.…
dbee099
…connect to factory (pythonGH-95146)
This PR partially reverts pythongh-24421 (PR) and fixes the remaining concerns
given in pythongh-93044 (issue):
- keyword arguments are passed as positional arguments to factory()
- if an argument is not passed to sqlite3.connect(), its default value
is passed to factory()
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>.
(cherry picked from commit a3d4d15)
Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
@bedevere-botbedevere-bot removed the needs backport to 3.11 only security fixes label Jul 23, 2022
@bedevere-bot

bedevere-bot commented Jul 23, 2022

Copy link
Copy Markdown

GH-95158 is a backport of this pull request to the 3.11 branch.

@erlend-aaslanderlend-aasland mentioned this pull request Jul 23, 2022
Closed
erlend-aasland pushed a commit that referenced this pull request Jul 23, 2022
Erlend Egeberg Aasland
[3.11]gh-95132: Correctly relay *args and **kwds from sqlite3.connec…
5d3f2fb
…t to factory (GH-95146) (#95158)
This PR partially reverts gh-24421 (PR) and fixes the remaining concerns
given in gh-93044 (issue):
- keyword arguments are passed as positional arguments to factory()
- if an argument is not passed to sqlite3.connect(), its default value
is passed to factory()
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>.
(cherry picked from commit a3d4d15)
Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
@erlend-aaslanderlend-aasland mentioned this pull request Aug 8, 2022
Merged
2 tasks
@AlexWaygoodAlexWaygood mentioned this pull request Nov 2, 2022
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@serhiy-storchakaserhiy-storchakaserhiy-storchaka approved these changes
@berkerpeksagberkerpeksagAwaiting requested review from berkerpeksag

Assignees

@erlend-aaslanderlend-aasland

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Python3.11: sqlite3.connect passes more arguments to factory()

4 participants

@erlend-aasland@bedevere-bot@serhiy-storchaka@miss-islington