Skip to content
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

Jump to bottom

Fix error message in sqlite connection thread check #6028

Merged
merged 1 commit into from
Mar 26, 2018
Merged

Fix error message in sqlite connection thread check #6028

merged 1 commit into from
Mar 26, 2018

Conversation

iwiwi
Copy link
Contributor

@iwiwi iwiwi commented Mar 8, 2018

This is a trivial change that fixes an error message. It adds a missing whitespace and period.

Before:

sqlite3.ProgrammingError: SQLite objects created in a thread can only be used in that same thread.The object was created in thread id 140737042412480 and this is thread id 123145375645696

After:

sqlite3.ProgrammingError: SQLite objects created in a thread can only be used in that same thread. The object was created in thread id 140737042412480 and this is thread id 123145375645696.

@the-knights-who-say-ni
Copy link

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept your contribution by verifying you have signed the PSF contributor agreement (CLA).

Unfortunately we couldn't find an account corresponding to your GitHub username on bugs.python.org (b.p.o) to verify you have signed the CLA (this might be simply due to a missing "GitHub Name" entry in your b.p.o account settings). This is necessary for legal reasons before we can look at your contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

Thanks again to your contribution and we look forward to looking at it!

@iwiwi iwiwi force-pushed the fix-sqlite-error-msg branch from 7576e0d to ee291e4 Compare March 9, 2018 03:35
@iwiwi iwiwi force-pushed the fix-sqlite-error-msg branch from ee291e4 to 75ff91f Compare March 10, 2018 01:16
@serhiy-storchaka serhiy-storchaka merged commit 030345c into python:master Mar 26, 2018
@miss-islington
Copy link
Contributor

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

@serhiy-storchaka
Copy link
Member

Thank you @iwiwi!

@bedevere-bot
Copy link

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Mar 26, 2018
@iwiwi @miss-islington
Fix error message in sqlite connection thread check. (pythonGH-6028)
a1b59cf 
(cherry picked from commit 030345c)

Co-authored-by: Takuya Akiba <469803+iwiwi@users.noreply.github.com>
@miss-islington
Copy link
Contributor

Sorry, @iwiwi 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 030345c0bfc2f76684666fe5c61e766ba5debfe6 2.7

@miss-islington
Copy link
Contributor

Sorry, @iwiwi 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 030345c0bfc2f76684666fe5c61e766ba5debfe6 3.6

miss-islington added a commit that referenced this pull request Mar 26, 2018
@miss-islington @iwiwi
Fix error message in sqlite connection thread check. (GH-6028)
00765bb 
(cherry picked from commit 030345c)

Co-authored-by: Takuya Akiba <469803+iwiwi@users.noreply.github.com>
serhiy-storchaka pushed a commit to serhiy-storchaka/cpython that referenced this pull request Mar 31, 2018
@iwiwi @serhiy-storchaka
[3.6] Fix error message in sqlite connection thread check. (pythonGH-…
fbb6478 
…6028).

(cherry picked from commit 030345c)

Co-authored-by: Takuya Akiba <469803+iwiwi@users.noreply.github.com>
@bedevere-bot
Copy link

GH-6324 is a backport of this pull request to the 3.6 branch.

serhiy-storchaka pushed a commit to serhiy-storchaka/cpython that referenced this pull request Mar 31, 2018
@iwiwi @serhiy-storchaka
[2.7] Fix error message in sqlite connection thread check. (pythonGH-…
dcc0f93 
…6028).

(cherry picked from commit 030345c)

Co-authored-by: Takuya Akiba <469803+iwiwi@users.noreply.github.com>
@bedevere-bot
Copy link

GH-6325 is a backport of this pull request to the 2.7 branch.

serhiy-storchaka added a commit that referenced this pull request Mar 31, 2018
@serhiy-storchaka @iwiwi
[3.6] Fix error message in sqlite connection thread check. (GH-6028). (…
d918bbd 
…GH-6324)

(cherry picked from commit 030345c)

Co-authored-by: Takuya Akiba <469803+iwiwi@users.noreply.github.com>
serhiy-storchaka added a commit that referenced this pull request Mar 31, 2018
@serhiy-storchaka @iwiwi
[2.7] Fix error message in sqlite connection thread check. (GH-6028). (…
924035a 
…GH-6325)

(cherry picked from commit 030345c)

Co-authored-by: Takuya Akiba <469803+iwiwi@users.noreply.github.com>
@iwiwi iwiwi deleted the fix-sqlite-error-msg branch April 5, 2018 13:46
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
skip issue skip news 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
@iwiwi @the-knights-who-say-ni @miss-islington @serhiy-storchaka @bedevere-bot