summaryrefslogtreecommitdiffstats
path: root/Lib/_pyrepl/reader.py
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2024-06-03 17:31:26 (GMT)
committerGitHub <noreply@github.com>2024-06-03 17:31:26 (GMT)
commit6b10467fbc0b67bf217ea27956b545103c4a0ad5 (patch)
tree1834facbc48d28d94480feb0e8d75e69a3755433 /Lib/_pyrepl/reader.py
parent060d846f436027c0169fc8e2d3a0a7b9bc9afee8 (diff)
downloadcpython-6b10467fbc0b67bf217ea27956b545103c4a0ad5.zip
cpython-6b10467fbc0b67bf217ea27956b545103c4a0ad5.tar.gz
cpython-6b10467fbc0b67bf217ea27956b545103c4a0ad5.tar.bz2
[3.13] gh-118835: pyrepl: Fix prompt length computation for custom prompts containing ANSI escape codes (GH-119942) (#119990)
gh-118835: pyrepl: Fix prompt length computation for custom prompts containing ANSI escape codes (GH-119942) (cherry picked from commit 2e0aa731aebb8ef3d89ada82f5d39b1bbac65d1f) Co-authored-by: Daniel Hollas <daniel.hollas@bristol.ac.uk>
Diffstat (limited to 'Lib/_pyrepl/reader.py')
-rw-r--r--Lib/_pyrepl/reader.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/Lib/_pyrepl/reader.py b/Lib/_pyrepl/reader.py
index 53e0954..7839116 100644
--- a/Lib/_pyrepl/reader.py
+++ b/Lib/_pyrepl/reader.py
@@ -28,7 +28,7 @@ from _colorize import can_colorize, ANSIColors # type: ignore[import-not-found]
from . import commands, console, input
-from .utils import ANSI_ESCAPE_SEQUENCE, wlen
+from .utils import ANSI_ESCAPE_SEQUENCE, wlen, str_width
from .trace import trace
@@ -339,7 +339,8 @@ class Reader:
screeninfo.append((0, []))
return screen
- def process_prompt(self, prompt: str) -> tuple[str, int]:
+ @staticmethod
+ def process_prompt(prompt: str) -> tuple[str, int]:
"""Process the prompt.
This means calculate the length of the prompt. The character \x01
@@ -351,6 +352,11 @@ class Reader:
# sequences if they were not explicitly within \x01...\x02.
# They are CSI (or ANSI) sequences ( ESC [ ... LETTER )
+ # wlen from utils already excludes ANSI_ESCAPE_SEQUENCE chars,
+ # which breaks the logic below so we redefine it here.
+ def wlen(s: str) -> int:
+ return sum(str_width(i) for i in s)
+
out_prompt = ""
l = wlen(prompt)
pos = 0