Commitca18ff2

and

authored

gh-123228: fix return type for _ReadlineWrapper.get_line_buffer() (#123281)

Co-authored-by: Carl Friedrich Bolz-Tereick <cfbolz@gmx.de>

1 parentc4ee4e7 commitca18ff2Copy full SHA for ca18ff2

File tree

+13

-5

lines changed

+13

-5

lines changed

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -479,15 +479,14 @@ def add_history(self, line: str) -> None:`
`479`	`479`	`defset_startup_hook(self,function:Callback\|None=None)->None:`
`480`	`480`	`self.startup_hook=function`
`481`	`481`
`482`		`-defget_line_buffer(self)->bytes:`
`483`		`-buf_str=self.get_reader().get_unicode()`
`484`		`-returnbuf_str.encode(ENCODING)`
	`482`	`+defget_line_buffer(self)->str:`
	`483`	`+returnself.get_reader().get_unicode()`
`485`	`484`
`486`	`485`	`def_get_idxs(self)->tuple[int,int]:`
`487`	`486`	`start=cursor=self.get_reader().pos`
`488`	`487`	`buf=self.get_line_buffer()`
`489`	`488`	`foriinrange(cursor-1,-1,-1):`
`490`		`-ifstr(buf[i])inself.get_completer_delims():`
	`489`	`+ifbuf[i]inself.get_completer_delims():`
`491`	`490`	`break`
`492`	`491`	`start=i`
`493`	`492`	`returnstart,cursor`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,8 @@`
`26`	`26`	`make_clean_env,`
`27`	`27`	`)`
`28`	`28`	`from_pyrepl.consoleimportEvent`
`29`		`-from_pyrepl.readlineimportReadlineAlikeReader,ReadlineConfig`
	`29`	`+from_pyrepl.readlineimport (ReadlineAlikeReader,ReadlineConfig,`
	`30`	`+_ReadlineWrapper)`
`30`	`31`	`from_pyrepl.readlineimportmultiline_inputasreadline_multiline_input`
`31`	`32`
`32`	`33`	`try:`
`@@ -516,6 +517,11 @@ def test_basic(self):`
`516`	`517`	`self.assertEqual(output,"1+1")`
`517`	`518`	`self.assertEqual(clean_screen(reader.screen),"1+1")`
`518`	`519`
	`520`	`+deftest_get_line_buffer_returns_str(self):`
	`521`	`+reader=self.prepare_reader(code_to_events("\n"))`
	`522`	`+wrapper=_ReadlineWrapper(reader=reader)`
	`523`	`+self.assertIs(type(wrapper.get_line_buffer()),str)`
	`524`	`+`
`519`	`525`	`deftest_multiline_edit(self):`
`520`	`526`	`events=itertools.chain(`
`521`	`527`	`code_to_events("def f():\n...\n\n"),`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Fix return type for`
	`2`	+:func:`!_pyrepl.readline._ReadlineWrapper.get_line_buffer` to be
	`3`	+:func:`str`. Patch by Sergey B Kirpichev.

Comments

(0)