gh-119310: Fix encoding when reading old history file#121779

Merged

ambv merged 7 commits intopython:mainfrom

aorcajo:fix-issue-119310

Sep 6, 2024

Contributor

aorcajo commented Jul 14, 2024 •

edited

Loading

This fixes the problem reading history files created with previous versions of python (that where using GNU readline). Checks that the file was created by readline and change the encoding to unicode-escape.

Issue: '\040' instead of space in repl history on macOS with 3.13 or main branch #119310

ghost commented Jul 14, 2024 •

edited by ghost

Loading

All commit authors signed the Contributor License Agreement.

bedevere-app bot mentioned this pull request

'\040' instead of space in repl history on macOS with 3.13 or main branch #119310

Closed

bedevere-app bot commented Jul 14, 2024

Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool.

If this change has little impact on Python users, wait for a maintainer to apply the skip news label instead.

1 similar comment

bedevere-app bot commented Jul 15, 2024

Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool.

If this change has little impact on Python users, wait for a maintainer to apply the skip news label instead.

aorcajo marked this pull request as ready for review

July 15, 2024 11:28

aorcajo requested review from ambv, lysnikolaou and pablogsal as code owners

July 15, 2024 11:28

bedevere-app bot added the awaiting review label

bedevere-app bot commented Jul 16, 2024

Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool.

If this change has little impact on Python users, wait for a maintainer to apply the skip news label instead.


          pythongh-119310: Fix encoding when reading old history file

d009abf

aorcajo force-pushed the fix-issue-119310 branch from 2ac46fd to d009abf Compare

July 16, 2024 10:04

bedevere-app bot commented Jul 16, 2024

Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool.

If this change has little impact on Python users, wait for a maintainer to apply the skip news label instead.


          Fix test for systems using GNU readline

66f2ab8

bedevere-app bot commented Jul 19, 2024

Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool.

If this change has little impact on Python users, wait for a maintainer to apply the skip news label instead.

aorcajo added 2 commits

July 20, 2024 01:26


          Merge remote-tracking branch 'upstream/main' into fix-issue-119310

987d41d


          Change varname is_readline to is_editline

7479f41

bedevere-app bot commented Jul 19, 2024

Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool.

If this change has little impact on Python users, wait for a maintainer to apply the skip news label instead.

ambv reviewed

View reviewed changes

Lib/test/test_pyrepl/test_pyrepl.py

Comment on lines +1127 to +1131

+                  def test_readline_history_file(self):
+                      # skip, if readline module is not available
+                      readline = import_module('readline')
+                      if readline.backend != "editline":
+                          self.skipTest("GNU readline is not affected by this issue")

Contributor

ambv Jul 19, 2024

Since what we're trying to do is to fix reading old history files, you could add three history files to test data:

an editline history file
a readline history file
a pyrepl history file with multiline blocks

That way all three would have tests and we wouldn't regress on all three fronts.

Contributor

ambv Sep 6, 2024

This will have to wait for a future enhancement.

ambv added the needs backport to 3.13 label

ambv added 3 commits

September 6, 2024 13:22


          Merge branch 'main' into pr-121779

04cd664


          Don't access/destroy history files during test runs

6b2d42a


          Add Blurb

71b3a33

ambv merged commit e959848 into python:main

bedevere-app bot removed the awaiting review label

miss-islington-app bot commented Sep 6, 2024

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request


          pythongh-119310: Fix encoding when reading old history file (pythonGH…

14ccc30

…-121779)

(cherry picked from commit e959848)

Co-authored-by: aorcajo <589252+aorcajo@users.noreply.github.com>
Co-authored-by: Łukasz Langa <lukasz@langa.pl>

bedevere-app bot commented Sep 6, 2024

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

bedevere-app bot removed the needs backport to 3.13 label

ambv added a commit that referenced this pull request


          [3.13] gh-119310: Fix encoding when reading old history file (GH-121779…

2cc1899

…) (#123784)

(cherry picked from commit e959848)

Co-authored-by: aorcajo <589252+aorcajo@users.noreply.github.com>
Co-authored-by: Łukasz Langa <lukasz@langa.pl>

encukou mentioned this pull request

test_pyrepl fails on x86-64 macOS buildbot -- setupterm: could not find terminfo database #123944

Closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet