gh-131507: Clean up tests and type checking for `_pyrepl` by ambv · Pull Request #131509 · python/cpython · GitHub

This is a prerequisite for the syntax highlighting change, but a separate PR so that this can be backported to 3.13 for ease of maintenance in the future.

The separate commits explain the separate steps:

remove a hack for zero-width escape code bracketing
refactor tests to allow assert_screen_equal in more places
make _colorize better: enumerate all ANSI colors, make type checking pass
upgrade mypy checks to use 3.13 and allow using Lib/_colorize.py in the checks (via a Misc/mypy/ trick with symlinks, let's see how that works out)

Issue: Syntax highlighting in PyREPL #131507

…b in checks

This is based off python#131509.

Looks good in general, minor nit in docstring

Suggested change

      
                    The prompt string has the zero-width brackets recognized by shells
          
                    (\x01 and \x02) removed.  The length ignores anything between those
          
                    brackets as well as any ANSI escape sequences.
          
                    The prompt string has the zero-width brackets (\x01 and \x02) 
          
                    recognized by shells removed.  The length ignores anything between
          
                    those brackets as well as any ANSI escape sequences.

Is this an improvement? There are many kinds of zero-width brackets, the ones I am interested in are those recognized by shells (\x01 and \x02). The original docstring uses that ordering then.

👍 I like this approach. I was concerned about the regular expressions performance but couldn't find anything too bad when testing

Why the extra space?

Because that's how the real prompts are in production. I didn't want the difference in tests since it was confusing for syntax highlighting later.

I may be missing something but looks like the old function was tracking nested ANSI escape seas outside \x01 and \x02 brackets but this one drops this no? What is the rationale?

There are three things the old function was trying to do (badly):

ignore anything between \001 and \002 for length calculation; and
remove \001 and \002 characters from the emitted prompt; and
also ignore any ANSI escape sequences from length calculation.

Since wlen() is already doing 3., a contributor here needed to recreate this function to not do that, because we were doing that later anyway. But it's simpler to just use the main wlen() with a string stripped of \001 .. \002 bracketed content.

I find the new form much easier on the eyes.

LGTM left some comments

Thanks @ambv for the PR 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

Sorry, @ambv, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 5d8e981c8477ce483374b2fe6cd309a08c956299 3.13

pythonGH-131509) (cherry picked from commit 5d8e981) Co-authored-by: Łukasz Langa <lukasz@langa.pl>

GH-131546 is a backport of this pull request to the 3.13 branch.

This is based off python#131509.

…131509) (GH-131546) (cherry picked from commit 5d8e981)

This is based off #131509.

…thonGH-131547) This is based off pythonGH-131509. (cherry picked from commit 4cc82ff) Co-authored-by: Łukasz Langa <lukasz@langa.pl>

…H-131547) (GH-131557) gh-131507: Refactor screen and cursor position calculations (GH-131547) This is based off GH-131509. (cherry picked from commit 4cc82ff) Co-authored-by: Łukasz Langa <lukasz@langa.pl>

ambv added 5 commits March 20, 2025 15:36

Add _pyrepl.utils.unbracket

b83d282

Refactor tests

a96eea4

Enumerate all ANSI colors, improve typing

5682219

Move mypy checks to 3.13, allow for using _colorize.py from the stdli…

231855b

…b in checks

Remove type: ignores that are no longer necessary

3c25c95

ambv requested review from hugovk, lysnikolaou and pablogsal as code owners March 20, 2025 14:50

bedevere-app Bot added the awaiting core review label Mar 20, 2025

bedevere-app Bot mentioned this pull request Mar 20, 2025

Syntax highlighting in PyREPL #131507

Closed

ambv added skip news needs backport to 3.13 bugs and security fixes labels Mar 20, 2025

ambv mentioned this pull request Mar 20, 2025

KeyboardInterrupt about test for REPL was directly captured by the test program #128676

Closed

ambv added a commit to ambv/cpython that referenced this pull request Mar 20, 2025

pythongh-131507 : Refactor screen and cursor position calculations

8dc6081

This is based off python#131509.

ambv mentioned this pull request Mar 20, 2025

gh-131507: Refactor screen and cursor position calculations ambv/cpython#88

Closed

ambv added a commit to ambv/cpython that referenced this pull request Mar 20, 2025

pythongh-131507 : Refactor screen and cursor position calculations

ede4c08

This is based off python#131509.

Explain Misc/mypy

99469f3

ambv added a commit to ambv/cpython that referenced this pull request Mar 20, 2025

pythongh-131507 : Refactor screen and cursor position calculations

4ab5a7b

This is based off python#131509.

StanFromIreland reviewed Mar 20, 2025

View reviewed changes

pablogsal reviewed Mar 21, 2025

View reviewed changes

pablogsal approved these changes Mar 21, 2025

View reviewed changes

bedevere-app Bot added awaiting merge and removed awaiting core review labels Mar 21, 2025

ambv merged commit 5d8e981 into python:main Mar 21, 2025

bedevere-app Bot removed the awaiting merge label Mar 21, 2025

miss-islington-app Bot assigned ambv Mar 21, 2025

ambv added a commit to ambv/cpython that referenced this pull request Mar 21, 2025

[3.13] pythongh-131507 : Clean up tests and type checking for _pyrepl (

dc14a75

pythonGH-131509) (cherry picked from commit 5d8e981) Co-authored-by: Łukasz Langa <lukasz@langa.pl>

bedevere-app Bot removed the needs backport to 3.13 bugs and security fixes label Mar 21, 2025

ambv added a commit to ambv/cpython that referenced this pull request Mar 21, 2025

pythongh-131507 : Refactor screen and cursor position calculations

f9f4722

This is based off python#131509.

ambv deleted the pyrepl-sh-refactor-tests branch March 21, 2025 14:59

ambv mentioned this pull request Mar 21, 2025

gh-131507: Refactor screen and cursor position calculations #131547

Merged

ambv added a commit that referenced this pull request Mar 21, 2025

[3.13] gh-131507 : Clean up tests and type checking for _pyrepl (GH-…

095c126

…131509) (GH-131546) (cherry picked from commit 5d8e981)

ambv added a commit that referenced this pull request Mar 21, 2025

gh-131507 : Refactor screen and cursor position calculations (GH-131547 )

4cc82ff

This is based off #131509.

miss-islington mentioned this pull request Mar 21, 2025

[3.13] gh-131507: Refactor screen and cursor position calculations (GH-131547) #131557

Merged

hugovk mentioned this pull request Apr 8, 2025

Skip symlinks when creating SBOM for source tarball python/release-tools#232

Merged

sobolevn mentioned this pull request Apr 28, 2025

Enable type checking of tomllib stdlib folder #133117

Closed

                       reader.more_lines = partial(more_lines, namespace=namespace)
-                      reader.ps1 = reader.ps2 = ">>>"
-                      reader.ps3 = reader.ps4 = "..."
+                      reader.ps1 = reader.ps2 = ">>> "

gh-131507: Clean up tests and type checking for `_pyrepl` by ambv · Pull Request #131509 · python/cpython · GitHub

Uh oh!

Uh oh!

gh-131507: Clean up tests and type checking for _pyrepl - #131509

gh-131507: Clean up tests and type checking for _pyrepl#131509
ambv merged 6 commits into
python:mainfrom
ambv:pyrepl-sh-refactor-tests

ambv commented Mar 20, 2025 •
edited by bedevere-app Bot
Loading

Uh oh!

Uh oh!

StanFromIreland left a comment

Uh oh!

StanFromIreland Mar 20, 2025

Uh oh!

ambv Mar 20, 2025

Uh oh!

pablogsal Mar 21, 2025

Uh oh!

pablogsal Mar 21, 2025

Uh oh!

ambv Mar 21, 2025

Uh oh!

pablogsal Mar 21, 2025

Uh oh!

ambv Mar 21, 2025

Uh oh!

pablogsal left a comment

Uh oh!

miss-islington-app Bot commented Mar 21, 2025

Uh oh!

miss-islington-app Bot commented Mar 21, 2025

Uh oh!

bedevere-app Bot commented Mar 21, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		return length - sum(len(i) for i in sequence) + ctrl_z_cnt


		def unbracket(s: str, including_content: bool = False) -> str:

		@@ -421,42 +421,15 @@ def calc_screen(self) -> list[str]:

		@staticmethod
		def process_prompt(prompt: str) -> tuple[str, int]:

gh-131507: Clean up tests and type checking for `_pyrepl` by ambv · Pull Request #131509 · python/cpython · GitHub

Uh oh!

Uh oh!

gh-131507: Clean up tests and type checking for _pyrepl - #131509

gh-131507: Clean up tests and type checking for _pyrepl#131509ambv merged 6 commits intopython:mainpython/cpython:mainfrom ambv:pyrepl-sh-refactor-testsambv/cpython:pyrepl-sh-refactor-testsCopy head branch name to clipboard

Conversation

ambv commented Mar 20, 2025 • edited by bedevere-app Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

StanFromIreland left a comment

Choose a reason for hiding this comment

Uh oh!

StanFromIreland Mar 20, 2025

Choose a reason for hiding this comment

Uh oh!

ambv Mar 20, 2025

Choose a reason for hiding this comment

Uh oh!

pablogsal Mar 21, 2025

Choose a reason for hiding this comment

Uh oh!

pablogsal Mar 21, 2025

Choose a reason for hiding this comment

Uh oh!

ambv Mar 21, 2025

Choose a reason for hiding this comment

Uh oh!

pablogsal Mar 21, 2025

Choose a reason for hiding this comment

Uh oh!

ambv Mar 21, 2025

Choose a reason for hiding this comment

Uh oh!

pablogsal left a comment

Choose a reason for hiding this comment

Uh oh!

miss-islington-app Bot commented Mar 21, 2025

Uh oh!

miss-islington-app Bot commented Mar 21, 2025

Uh oh!

bedevere-app Bot commented Mar 21, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

gh-131507: Clean up tests and type checking for _pyrepl#131509
ambv merged 6 commits into
python:mainfrom
ambv:pyrepl-sh-refactor-tests

ambv commented Mar 20, 2025 •
edited by bedevere-app Bot
Loading