From 4449846cfef16c28793f51c3b3a8d825a2cf99b1 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Fri, 31 Dec 2021 13:59:15 +0100 Subject: [PATCH 1/3] Fix tests with Python 3.10.1 --- bpython/test/test_interpreter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bpython/test/test_interpreter.py b/bpython/test/test_interpreter.py index ca64de77..1a5eed39 100644 --- a/bpython/test/test_interpreter.py +++ b/bpython/test/test_interpreter.py @@ -35,7 +35,7 @@ def test_syntaxerror(self): i.runsource("1.1.1.1") - if sys.version_info[:2] >= (3, 10): + if (3, 10, 0) <= sys.version_info[:3] < (3, 10, 1): expected = ( " File " + green('""') @@ -47,7 +47,7 @@ def test_syntaxerror(self): + cyan("invalid syntax. Perhaps you forgot a comma?") + "\n" ) - elif (3, 8) <= sys.version_info[:2] <= (3, 9): + elif (3, 8) <= sys.version_info[:2]: expected = ( " File " + green('""') From 7c103407ae96c3ee2ac1ab6431bed22251dbf2cb Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Fri, 31 Dec 2021 14:08:35 +0100 Subject: [PATCH 2/3] Really fix tests with Python 3.10.1 --- bpython/test/test_interpreter.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/bpython/test/test_interpreter.py b/bpython/test/test_interpreter.py index 1a5eed39..45ffa66d 100644 --- a/bpython/test/test_interpreter.py +++ b/bpython/test/test_interpreter.py @@ -35,7 +35,19 @@ def test_syntaxerror(self): i.runsource("1.1.1.1") - if (3, 10, 0) <= sys.version_info[:3] < (3, 10, 1): + if (3, 10, 1) <= sys.version_info[:3]: + expected = ( + " File " + + green('""') + + ", line " + + bold(magenta("1")) + + "\n 1.1.1.1\n ^^\n" + + bold(red("SyntaxError")) + + ": " + + cyan("invalid syntax") + + "\n" + ) + elif (3, 10) <= sys.version_info[:2]: expected = ( " File " + green('""') From 09f96d28a4a881f5a7e357b68eec9ac2836c2b52 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Tue, 29 Mar 2022 21:02:34 +0200 Subject: [PATCH 3/3] Add changelog entry for 0.22.2 --- CHANGELOG.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 00244b1c..94975539 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,13 @@ Changelog ========= +0.22.2 +------ + +Fixes: + +* Make tests compatible with Python 3.10. + 0.22.1 ------