close
The Wayback Machine - https://web.archive.org/web/20221223174958/https://github.com/python/cpython/pull/20538
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.

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

bpo-40823: Use loadTestsFromTestCase() iso. makeSuite() in sqlite3 tests #20538

Merged
merged 6 commits into from Jan 7, 2021

Conversation

erlend-aasland
Copy link
Contributor

@erlend-aasland erlend-aasland commented May 30, 2020

Copy link
Member

@berkerpeksag berkerpeksag left a comment

I don't have a strong objection to this, but if we are going to drop Check prefix, I'd prefer using test_* instead of test*.

@bedevere-bot
Copy link

bedevere-bot commented Jan 6, 2021

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

@erlend-aasland
Copy link
Contributor Author

erlend-aasland commented Jan 6, 2021

I don't have a strong objection to this, but if we are going to drop Check prefix, I'd prefer using test_* instead of test*.

No problem. I'll rebase onto master and fix the naming.

Erlend E. Aasland added 2 commits Jan 6, 2021
Ref. issue 5846: unittest.makeSuite is deprecated
Lib/sqlite3/test/types.py Outdated Show resolved Hide resolved
@erlend-aasland
Copy link
Contributor Author

erlend-aasland commented Jan 6, 2021

PTAL, @berkerpeksag. Rebased onto master with snake case method naming. IMHO, it looks really nice now.

@erlend-aasland
Copy link
Contributor Author

erlend-aasland commented Jan 6, 2021

I have made the requested changes; please review again

@bedevere-bot
Copy link

bedevere-bot commented Jan 6, 2021

Thanks for making the requested changes!

@berkerpeksag: please review the changes made to this pull request.

@bedevere-bot bedevere-bot requested a review from berkerpeksag Jan 6, 2021
Lib/sqlite3/test/userfunctions.py Outdated Show resolved Hide resolved
@bedevere-bot
Copy link

bedevere-bot commented Jan 6, 2021

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

Erlend Egeberg Aasland added 3 commits Jan 6, 2021
test_cursor_description_ctes_multiple_columns => test_cursor_description_cte_multiple_columns
@erlend-aasland
Copy link
Contributor Author

erlend-aasland commented Jan 6, 2021

I have made the requested changes; please review again

@bedevere-bot
Copy link

bedevere-bot commented Jan 6, 2021

Thanks for making the requested changes!

@berkerpeksag: please review the changes made to this pull request.

@bedevere-bot bedevere-bot requested a review from berkerpeksag Jan 6, 2021
@erlend-aasland
Copy link
Contributor Author

erlend-aasland commented Jan 6, 2021

GitHub messed up the encoding again! See #20538 (comment). I must remember no to use the suggestion feature for these files. We should normalise the encodings:

$ file Lib/sqlite3/test/*.py
Lib/sqlite3/test/__init__.py:      empty
Lib/sqlite3/test/backup.py:        Python script text executable, ASCII text
Lib/sqlite3/test/dbapi.py:         Python script text executable, ISO-8859 text
Lib/sqlite3/test/dump.py:          Python script text executable, ASCII text
Lib/sqlite3/test/factory.py:       Python script text executable, ISO-8859 text
Lib/sqlite3/test/hooks.py:         Python script text executable, ISO-8859 text
Lib/sqlite3/test/regression.py:    Python script text executable, ISO-8859 text
Lib/sqlite3/test/transactions.py:  Python script text executable, ISO-8859 text
Lib/sqlite3/test/types.py:         Python script text executable, UTF-8 Unicode text
Lib/sqlite3/test/userfunctions.py: Python script text executable, UTF-8 Unicode text

@erlend-aasland
Copy link
Contributor Author

erlend-aasland commented Jan 6, 2021

The same thing happened in #20448, and we ended up just converting Lib/sqlite3/test/userfunctions.py to UTF-8 in the same PR. I'd say we convert the rest right away. Agreed, @berkerpeksag?

@berkerpeksag
Copy link
Member

berkerpeksag commented Jan 6, 2021

The same thing happened in #20448, and we ended up just converting Lib/sqlite3/test/userfunctions.py to UTF-8 in the same PR. I'd say we convert the rest right away. Agreed, @berkerpeksag?

I failed to see what's wrong here and #20448 has lots of comments. Why do you want to convert encodings of these files?

@erlend-aasland
Copy link
Contributor Author

erlend-aasland commented Jan 6, 2021

I failed to see what's wrong here and #20448 has lots of comments. Why do you want to convert encodings of these files?

Commit fd4f651 was auto-generated by GitHub from the "suggestion" I set up in #20538 (comment). As you notice from the diff, GitHub silently converted the file from ISO-8859 encoding to UTF-8 encoding (ignoring the #-*- coding: iso-8859-1 -*- header), in addition to applying the "suggestion" I set up. Over at #20448 the same thing happened; Victor Stinner set up a "suggestion", which I applied, and then GitHub silently converted Lib/sqlite3/test/userfunctions.py from ISO-8859 to UTF-8. Instead of reverting the encoding change GitHub made, we decided to just remove the #-*- coding: iso-8859-1 -*- header, since GitHub obviously dislikes ISO-8859.

@berkerpeksag
Copy link
Member

berkerpeksag commented Jan 6, 2021

Ah, I see now, thanks for the explanation! Personally, I prefer reverting the commit generated by GitHub and apply the suggested change manually. I don't like when companies try to impose their own practices (it doesn't mean they are bad practices) on a perfectly fine piece of code :)

@erlend-aasland
Copy link
Contributor Author

erlend-aasland commented Jan 6, 2021

… or we can revert the encoding change and create an issue for normalising the encodings.

Ah, I see now, thanks for the explanation! Personally, I prefer reverting the commit generated by GitHub and apply the suggested change manually. I don't like when companies try to impose their own practices (it doesn't mean they are bad practices) on a perfectly fine piece of code :)

No problem. I'll open an issue for normalising the file encodings. Consistence FTW :)

@erlend-aasland
Copy link
Contributor Author

erlend-aasland commented Jan 6, 2021

Reverted in f93a63b. PTAL, @berkerpeksag

Copy link
Member

@berkerpeksag berkerpeksag left a comment

LGTM!

@berkerpeksag berkerpeksag merged commit 849e339 into python:master Jan 7, 2021
3 checks passed
@erlend-aasland erlend-aasland deleted the fix-issue-40823 branch Jan 7, 2021
adorilson pushed a commit to adorilson/cpython that referenced this pull request Mar 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants