GH-130328: Speedup pasting in legacy console on Windows#133728
Conversation
ambv
left a comment
There was a problem hiding this comment.
This is perfect. You utilized my getpending() implementation without adding any double-buffering. It is indeed speeding things up dramatically while not breaking the existing bracketed paste behavior.
Sorry, something went wrong.
|
Thanks @chris-eibl for the PR, and @ambv for merging it 🌮🎉.. I'm working now to backport this PR to: 3.14. |
Sorry, something went wrong.
…gh-133728) (cherry picked from commit 91b4886) Co-authored-by: Chris Eibl <138194463+chris-eibl@users.noreply.github.com>
⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️Hi! The buildbot AMD64 Windows10 3.x (tier-1) has failed when building commit 91b4886. What do you need to do:
You can take a look at the buildbot page here: https://buildbot.python.org/#/builders/146/builds/11526 Failed tests:
Failed subtests:
Summary of the results of the build (if available): == Click to see traceback logsTraceback (most recent call last):
File "D:\buildarea\3.x.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 415, in test_WINDOW_BUFFER_SIZE_EVENT
self.assertEqual(self.get_event([ir]), Event("resize", ""))
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='resize', data='', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.x.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 466, in test_left_RIGHT_CTRL_PRESSED
self.assertEqual(
~~~~~~~~~~~~~~~~^
self.get_event([ir]), Event("key", "ctrl left"))
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='ctrl left', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.x.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 534, in test_AltGr_7
self.assertEqual(self.get_event([ir]), Event("key", "{"))
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='{', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.x.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 454, in test_M
self.assertEqual(self.get_event([ir]), Event("key", "M"))
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='M', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.x.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 562, in test_enter_vt
self.assertEqual(self.get_event([ir], vt_support=True),
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Event("key", "\n"))
^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='\n', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.x.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 449, in test_m
self.assertEqual(self.get_event([ir]), Event("key", "m"))
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='m', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.x.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 510, in test_m_LEFT_ALT_PRESSED
self.assertEqual(self.get_event([ir]), Event(evt="key", data="\033"))
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='\x1b', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.x.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 548, in test_umlaut_a_german
self.assertEqual(self.get_event([ir]), Event("key", "�"))
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='�', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.x.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 517, in test_m_RIGHT_ALT_PRESSED
self.assertEqual(self.get_event([ir]), Event(evt="key", data="\033"))
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='\x1b', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.x.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 543, in test_AltGr_m
self.assertEqual(self.get_event([ir]), Event("key", "�"))
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='�', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.x.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 443, in test_backspace
self.assertEqual(
~~~~~~~~~~~~~~~~^
self.get_event([ir]), Event("key", "backspace"))
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='backspace', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.x.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 473, in test_left_LEFT_CTRL_PRESSED
self.assertEqual(
~~~~~~~~~~~~~~~~^
self.get_event([ir]), Event("key", "ctrl left"))
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='ctrl left', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.x.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 480, in test_left_RIGHT_ALT_PRESSED
self.assertEqual(self.get_event([ir]), Event(evt="key", data="\033"))
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='\x1b', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.x.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 460, in test_left
self.assertEqual(self.get_event([ir]), Event("key", "left"))
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='left', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.x.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 434, in test_unhandled_events
self.assertEqual(self.mock.call_count, 1)
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: 0 != 1
Traceback (most recent call last):
File "D:\buildarea\3.x.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 438, in test_enter
self.assertEqual(self.get_event([ir]), Event("key", "\n"))
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='\n', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.x.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 407, in test_EmptyBuffer
self.assertEqual(self.mock.call_count, 1)
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: 0 != 1
Traceback (most recent call last):
File "D:\buildarea\3.x.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 490, in test_left_LEFT_ALT_PRESSED
self.assertEqual(self.get_event([ir]), Event(evt="key", data="\033"))
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='\x1b', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.x.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 574, in test_up_vt
self.assertEqual(self.get_event(irs, vt_support=True),
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Event(evt='key', data='up', raw=bytearray(b'\x1b[A')))
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='up', raw=bytearray(b'\x1b[A'))
Traceback (most recent call last):
File "D:\buildarea\3.x.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 505, in test_m_LEFT_ALT_PRESSED_and_LEFT_CTRL_PRESSED
self.assertEqual(self.mock.call_count, 1)
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: 0 != 1
Traceback (most recent call last):
File "D:\buildarea\3.x.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 568, in test_backspace_vt
self.assertEqual(self.get_event([ir], vt_support=True),
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Event("key", "backspace", b"\x7f"))
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='backspace', raw=b'\x7f')
Traceback (most recent call last):
File "D:\buildarea\3.x.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 424, in test_KEY_EVENT_up_ignored
self.assertEqual(self.mock.call_count, 1)
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: 0 != 1
|
Sorry, something went wrong.
|
@chris-eibl this buildbot failure ^^^ is real. I can't explain that yet and cannot reproduce it locally on Win 11, but if I don't manage to fix it before tomorrow's 3.14 beta 2, I will have to revert the backport. |
Sorry, something went wrong.
⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️Hi! The buildbot AMD64 Windows10 3.14 (tier-1) has failed when building commit 93aee56. What do you need to do:
You can take a look at the buildbot page here: https://buildbot.python.org/#/builders/1711/builds/99 Failed tests:
Failed subtests:
Summary of the results of the build (if available): == Click to see traceback logsTraceback (most recent call last):
File "D:\buildarea\3.14.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 466, in test_left_RIGHT_CTRL_PRESSED
self.assertEqual(
~~~~~~~~~~~~~~~~^
self.get_event([ir]), Event("key", "ctrl left"))
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='ctrl left', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.14.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 449, in test_m
self.assertEqual(self.get_event([ir]), Event("key", "m"))
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='m', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.14.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 480, in test_left_RIGHT_ALT_PRESSED
self.assertEqual(self.get_event([ir]), Event(evt="key", data="\033"))
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='\x1b', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.14.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 473, in test_left_LEFT_CTRL_PRESSED
self.assertEqual(
~~~~~~~~~~~~~~~~^
self.get_event([ir]), Event("key", "ctrl left"))
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='ctrl left', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.14.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 407, in test_EmptyBuffer
self.assertEqual(self.mock.call_count, 1)
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: 0 != 1
Traceback (most recent call last):
File "D:\buildarea\3.14.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 454, in test_M
self.assertEqual(self.get_event([ir]), Event("key", "M"))
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='M', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.14.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 438, in test_enter
self.assertEqual(self.get_event([ir]), Event("key", "\n"))
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='\n', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.14.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 460, in test_left
self.assertEqual(self.get_event([ir]), Event("key", "left"))
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='left', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.14.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 424, in test_KEY_EVENT_up_ignored
self.assertEqual(self.mock.call_count, 1)
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: 0 != 1
Traceback (most recent call last):
File "D:\buildarea\3.14.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 568, in test_backspace_vt
self.assertEqual(self.get_event([ir], vt_support=True),
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Event("key", "backspace", b"\x7f"))
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='backspace', raw=b'\x7f')
Traceback (most recent call last):
File "D:\buildarea\3.14.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 534, in test_AltGr_7
self.assertEqual(self.get_event([ir]), Event("key", "{"))
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='{', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.14.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 510, in test_m_LEFT_ALT_PRESSED
self.assertEqual(self.get_event([ir]), Event(evt="key", data="\033"))
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='\x1b', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.14.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 548, in test_umlaut_a_german
self.assertEqual(self.get_event([ir]), Event("key", "�"))
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='�', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.14.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 415, in test_WINDOW_BUFFER_SIZE_EVENT
self.assertEqual(self.get_event([ir]), Event("resize", ""))
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='resize', data='', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.14.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 543, in test_AltGr_m
self.assertEqual(self.get_event([ir]), Event("key", "�"))
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='�', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.14.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 574, in test_up_vt
self.assertEqual(self.get_event(irs, vt_support=True),
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Event(evt='key', data='up', raw=bytearray(b'\x1b[A')))
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='up', raw=bytearray(b'\x1b[A'))
Traceback (most recent call last):
File "D:\buildarea\3.14.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 434, in test_unhandled_events
self.assertEqual(self.mock.call_count, 1)
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: 0 != 1
Traceback (most recent call last):
File "D:\buildarea\3.14.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 517, in test_m_RIGHT_ALT_PRESSED
self.assertEqual(self.get_event([ir]), Event(evt="key", data="\033"))
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='\x1b', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.14.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 490, in test_left_LEFT_ALT_PRESSED
self.assertEqual(self.get_event([ir]), Event(evt="key", data="\033"))
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='\x1b', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.14.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 505, in test_m_LEFT_ALT_PRESSED_and_LEFT_CTRL_PRESSED
self.assertEqual(self.mock.call_count, 1)
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: 0 != 1
Traceback (most recent call last):
File "D:\buildarea\3.14.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 443, in test_backspace
self.assertEqual(
~~~~~~~~~~~~~~~~^
self.get_event([ir]), Event("key", "backspace"))
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='backspace', raw=b'')
Traceback (most recent call last):
File "D:\buildarea\3.14.bolen-windows10\build\Lib\test\test_pyrepl\test_windows_console.py", line 562, in test_enter_vt
self.assertEqual(self.get_event([ir], vt_support=True),
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Event("key", "\n"))
^^^^^^^^^^^^^^^^^^^
AssertionError: None != Event(evt='key', data='\n', raw=b'')
|
Sorry, something went wrong.
|
I can reproduce these failures on Windows 10, too, for both main and 3.14 when running in a legacy console. In fact, the fix is simple: in these tests I've introduced in #132439. They shouldn't depend on I must have run the tests back then in a Windows terminal, and most probably all the GH bots are Windows 11 based, too? |
Sorry, something went wrong.
|
Do you want me to create a PR or is the above diff sufficient? |
Sorry, something went wrong.
pythongh-134660) (cherry picked from commit 1000283) Co-authored-by: Chris Eibl <138194463+chris-eibl@users.noreply.github.com>
edited by bedevere-app
Bot
LoadingUh oh!
There was an error while loading. Please reload this page.
Copy link Copy MarkdownSorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.