NotificationsYou must be signed in to change notification settings
Fork32k
Star67.3k

Commit91b4886

authored

GH-130328: Speedup pasting in legacy console on Windows (gh-133728)

1 parent2fd09b0 commit91b4886Copy full SHA for 91b4886

File tree

5 files changed

+26

-12

lines changed

Lib
- _pyrepl
  - commands.py
  - windows_console.py
- test/test_pyrepl
  - test_unix_console.py
  - test_windows_console.py
Misc/NEWS.d/next/Library
- 2025-05-09-09-10-34.gh-issue-130328.s9h4By.rst

5 files changed

+26

-12

lines changed

`‎Lib/_pyrepl/commands.py`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -370,6 +370,13 @@ def do(self) -> None:`
`370`	`370`	`r=self.reader`
`371`	`371`	`text=self.event*r.get_arg()`
`372`	`372`	`r.insert(text)`
	`373`	`+ifr.paste_mode:`
	`374`	`+data=""`
	`375`	`+ev=r.console.getpending()`
	`376`	`+data+=ev.data`
	`377`	`+ifdata:`
	`378`	`+r.insert(data)`
	`379`	`+r.last_refresh_cache.invalidated=True`
`373`	`380`
`374`	`381`
`375`	`382`	`classinsert_nl(EditCommand):`
`@@ -484,7 +491,6 @@ def do(self) -> None:`
`484`	`491`	`data=""`
`485`	`492`	`start=time.time()`
`486`	`493`	`whiledonenotindata:`
`487`		`-self.reader.console.wait(100)`
`488`	`494`	`ev=self.reader.console.getpending()`
`489`	`495`	`data+=ev.data`
`490`	`496`	`trace(`

`‎Lib/_pyrepl/windows_console.py`

Lines changed: 15 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -419,10 +419,7 @@ def _getscrollbacksize(self) -> int:`
`419`	`419`
`420`	`420`	`returninfo.srWindow.Bottom# type: ignore[no-any-return]`
`421`	`421`
`422`		`-def_read_input(self,block:bool=True)->INPUT_RECORD\|None:`
`423`		`-ifnotblockandnotself.wait(timeout=0):`
`424`		`-returnNone`
`425`		`-`
	`422`	`+def_read_input(self)->INPUT_RECORD\|None:`
`426`	`423`	`rec=INPUT_RECORD()`
`427`	`424`	`read=DWORD()`
`428`	`425`	`ifnotReadConsoleInput(InHandle,rec,1,read):`
`@@ -431,14 +428,10 @@ def _read_input(self, block: bool = True) -> INPUT_RECORD \| None:`
`431`	`428`	`returnrec`
`432`	`429`
`433`	`430`	`def_read_input_bulk(`
`434`		`-self,block:bool,n:int`
	`431`	`+self,n:int`
`435`	`432`	`)->tuple[ctypes.Array[INPUT_RECORD],int]:`
`436`	`433`	`rec= (n*INPUT_RECORD)()`
`437`	`434`	`read=DWORD()`
`438`		`-`
`439`		`-ifnotblockandnotself.wait(timeout=0):`
`440`		`-returnrec,0`
`441`		`-`
`442`	`435`	`ifnotReadConsoleInput(InHandle,rec,n,read):`
`443`	`436`	`raiseWinError(GetLastError())`
`444`	`437`
`@@ -449,8 +442,11 @@ def get_event(self, block: bool = True) -> Event \| None:`
`449`	`442`	`and there is no event pending, otherwise waits for the`
`450`	`443`	`completion of an event."""`
`451`	`444`
	`445`	`+ifnotblockandnotself.wait(timeout=0):`
	`446`	`+returnNone`
	`447`	`+`
`452`	`448`	`whileself.event_queue.empty():`
`453`		`-rec=self._read_input(block)`
	`449`	`+rec=self._read_input()`
`454`	`450`	`ifrecisNone:`
`455`	`451`	`returnNone`
`456`	`452`
`@@ -551,12 +547,20 @@ def getpending(self) -> Event:`
`551`	`547`	`ife2:`
`552`	`548`	`e.data+=e2.data`
`553`	`549`
`554`		`-recs,rec_count=self._read_input_bulk(False,1024)`
	`550`	`+recs,rec_count=self._read_input_bulk(1024)`
`555`	`551`	`foriinrange(rec_count):`
`556`	`552`	`rec=recs[i]`
	`553`	`+# In case of a legacy console, we do not only receive a keydown`
	`554`	`+# event, but also a keyup event - and for uppercase letters`
	`555`	`+# an additional SHIFT_PRESSED event.`
`557`	`556`	`ifrecandrec.EventType==KEY_EVENT:`
`558`	`557`	`key_event=rec.Event.KeyEvent`
	`558`	`+ifnotkey_event.bKeyDown:`
	`559`	`+continue`
`559`	`560`	`ch=key_event.uChar.UnicodeChar`
	`561`	`+ifch=="\x00":`
	`562`	`+# ignore SHIFT_PRESSED and special keys`
	`563`	`+continue`
`560`	`564`	`ifch=="\r":`
`561`	`565`	`ch+="\n"`
`562`	`566`	`e.data+=ch`

`‎Lib/test/test_pyrepl/test_unix_console.py`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`defunix_console(events,**kwargs):`
`21`	`21`	`console=UnixConsole()`
`22`	`22`	`console.get_event=MagicMock(side_effect=events)`
	`23`	`+console.getpending=MagicMock(return_value=Event("key",""))`
`23`	`24`
`24`	`25`	`height=kwargs.get("height",25)`
`25`	`26`	`width=kwargs.get("width",80)`

`‎Lib/test/test_pyrepl/test_windows_console.py`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ class WindowsConsoleTests(TestCase):`
`35`	`35`	`defconsole(self,events,**kwargs)->Console:`
`36`	`36`	`console=WindowsConsole()`
`37`	`37`	`console.get_event=MagicMock(side_effect=events)`
	`38`	`+console.getpending=MagicMock(return_value=Event("key",""))`
`38`	`39`	`console.wait=MagicMock()`
`39`	`40`	`console._scroll=MagicMock()`
`40`	`41`	`console._hide_cursor=MagicMock()`

`‎Misc/NEWS.d/next/Library/2025-05-09-09-10-34.gh-issue-130328.s9h4By.rst`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Speedup pasting in ``PyREPL`` on Windows in a legacy console. Patch by Chris
	`2`	`+Eibl.`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit91b4886

File tree

5 files changed

5 files changed

`‎Lib/_pyrepl/commands.py`

`‎Lib/_pyrepl/windows_console.py`

`‎Lib/test/test_pyrepl/test_unix_console.py`

`‎Lib/test/test_pyrepl/test_windows_console.py`

`‎Misc/NEWS.d/next/Library/2025-05-09-09-10-34.gh-issue-130328.s9h4By.rst`

0 commit comments