Skip to content

gh-119517: Fixes for pasting in pyrepl #120253

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.

Sign up for GitHub

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

Merged
pablogsal merged 12 commits into from
Jun 11, 2024
Merged

gh-119517: Fixes for pasting in pyrepl #120253

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6135335
Remove pyrepl's optimization for self-insert
godlygeek Jun 7, 2024
c568c89
Use line-buffering when pyrepl echoes pastes
godlygeek Jun 7, 2024
0de6080
Remove dead code from pyrepl
godlygeek Jun 7, 2024
651cf93
Speed up pyrepl's screen rendering computation
godlygeek Jun 7, 2024
0df62c8
Speed up pyrepl prompt drawing
godlygeek Jun 7, 2024
a4d3720
Speed up pasting multiple lines into the REPL
godlygeek Jun 7, 2024
0c4a0cc
Use a read buffer for input in pyrepl
godlygeek Jun 7, 2024
d50871f
Optimize finding width of a single character
godlygeek Jun 7, 2024
07b3302
Optimize disp_str for ASCII characters
godlygeek Jun 7, 2024
54a8987
Speed up cursor movements in long pyrepl commands
godlygeek Jun 7, 2024
0456835
Encapsulate the cached data in a class
pablogsal Jun 11, 2024
ae1185a
Do not show paste prompt on bracketed paste
pablogsal Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Optimize disp_str for ASCII characters 
Since every ASCII character is known to display as single width, we can
avoid not only the Unicode data lookup in `disp_str` but also the one
hidden in `str_width` for them.

Signed-off-by: Matt Wozniski <mwozniski@bloomberg.net>
  • Loading branch information
@godlygeek
godlygeek committed Jun 8, 2024
commit 07b3302e1aa2e3765f121c10a3340e15c18f2a0f
16 changes: 11 additions & 5 deletions Lib/_pyrepl/reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
def disp_str(buffer: str) -> tuple[str, list[int]]:
"""disp_str(buffer:string) -> (string, [int])

Return the string that should be the printed represenation of
Return the string that should be the printed representation of
|buffer| and a list detailing where the characters of |buffer|
get used up. E.g.:

Expand All @@ -52,11 +52,17 @@ def disp_str(buffer: str) -> tuple[str, list[int]]:
b: list[int] = []
s: list[str] = []
for c in buffer:
if ord(c) > 128 and unicodedata.category(c).startswith("C"):
if ord(c) < 128:
s.append(c)
b.append(1)
elif unicodedata.category(c).startswith("C"):
c = r"\u%04x" % ord(c)
s.append(c)
b.append(wlen(c))
b.extend([0] * (len(c) - 1))
s.append(c)
b.append(str_width(c))
b.extend([0] * (len(c) - 1))
else:
s.append(c)
b.append(str_width(c))
return "".join(s), b


Expand Down