gh-123228: fix return type for _ReadlineWrapper.get_line_buffer()#123281
Merged
cfbolz merged 7 commits intopython:mainfrom Aug 24, 2024
Merged
gh-123228: fix return type for _ReadlineWrapper.get_line_buffer()#123281cfbolz merged 7 commits intopython:mainfrom
cfbolz merged 7 commits intopython:mainfrom
Conversation
Contributor
|
implementation is fine, but why did you revert the test? |
Member
Author
This wasn't tested before and I'm not sure if this does make sense. |
Contributor
Let's keep the test. If it had been tested before, we would have found the problem in PyPy long ago (which just shows a test is a good idea). |
This reverts commit 119362b.
cfbolz
reviewed
Aug 24, 2024
Lib/test/test_pyrepl/test_pyrepl.py
Outdated
| @@ -1,3 +1,4 @@ | |||
| import curses | |||
Contributor
There was a problem hiding this comment.
this line is failing on windows. why is the except curses.error: pass needed anyway?
Member
Author
There was a problem hiding this comment.
Else this fails
Traceback (most recent call last):
File "/home/runner/work/cpython/cpython/Lib/test/test_pyrepl/test_pyrepl.py", line 522, in test_basic
self.assertIs(type(get_line_buffer()), str)
~~~~~~~~~~~~~~~^^
File "/home/runner/work/cpython/cpython/Lib/_pyrepl/readline.py", line 483, in get_line_buffer
return self.get_reader().get_unicode()
~~~~~~~~~~~~~~~^^
File "/home/runner/work/cpython/cpython/Lib/_pyrepl/readline.py", line 358, in get_reader
console = Console(self.f_in, self.f_out, encoding=ENCODING)
File "/home/runner/work/cpython/cpython/Lib/_pyrepl/unix_console.py", line 154, in __init__
curses.setupterm(term or None, self.output_fd)
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
_curses.error: setupterm: could not find terminfo database`
(e.g. here: https://github.com/python/cpython/actions/runs/10536985217/job/29197815100)
Contributor
|
dropping the import doesn't work, that will still make the test fail if class TestPyReplOutput(TestCase):
...
def test_get_line_buffer_returns_str(self):
reader = self.prepare_reader(code_to_events("\n"))
wrapper = _ReadlineWrapper(reader=reader)
self.assertIs(type(wrapper.get_line_buffer()), str)which doesn't require curses at all. |
Co-authored-by: Carl Friedrich Bolz-Tereick <cfbolz@gmx.de>
|
Thanks @skirpichev for the PR, and @cfbolz for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Aug 24, 2024
…() (pythonGH-123281) (cherry picked from commit ca18ff2) Co-authored-by: Sergey B Kirpichev <skirpichev@gmail.com> Co-authored-by: Carl Friedrich Bolz-Tereick <cfbolz@gmx.de>
|
GH-123293 is a backport of this pull request to the 3.13 branch. |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
str, not abytesobject #123228