From 11f9502192239fdb80ae517f2bbbec7163ba1176 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Tue, 12 Dec 2023 17:21:07 +0100 Subject: [PATCH] [3.11] [3.12] gh-83162: Rename re.error in idlelib (GH-101677) (GH-112987) (#113013) Backport idlelib part of GH-101677 with simple rename. (cherry picked from commit fd3b8947256309ba478a4e3ba8c0c81b1260b67f) Co-authored-by: Terry Jan Reedy --- Lib/idlelib/replace.py | 3 ++- Lib/idlelib/searchengine.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Lib/idlelib/replace.py b/Lib/idlelib/replace.py index a29ca5914274..71e187f92792 100644 --- a/Lib/idlelib/replace.py +++ b/Lib/idlelib/replace.py @@ -4,6 +4,7 @@ Defines various replace related functions like replace, replace all, and replace+find. """ import re +re.PatternError = re.error # New in 3.13. from tkinter import StringVar, TclError @@ -120,7 +121,7 @@ class ReplaceDialog(SearchDialogBase): if self.engine.isre(): try: new = m.expand(repl) - except re.error: + except re.PatternError: self.engine.report_error(repl, 'Invalid Replace Expression') new = None else: diff --git a/Lib/idlelib/searchengine.py b/Lib/idlelib/searchengine.py index 0684142f4364..5119de05865b 100644 --- a/Lib/idlelib/searchengine.py +++ b/Lib/idlelib/searchengine.py @@ -1,5 +1,6 @@ '''Define SearchEngine for search dialogs.''' import re +re.PatternError = re.error # New in 3.13. from tkinter import StringVar, BooleanVar, TclError from tkinter import messagebox @@ -84,7 +85,7 @@ class SearchEngine: flags = flags | re.IGNORECASE try: prog = re.compile(pat, flags) - except re.error as e: + except re.PatternError as e: self.report_error(pat, e.msg, e.pos) return None return prog -- 2.47.3