From: Sebastian Rittau <srittau@rittau.biz>
Date: Mon, 15 Jul 2024 17:18:37 +0000 (+0200)
Subject: gh-121785: Remove unused code from codecs.py (GH-121787)
X-Git-Tag: v3.14.0a1~1130
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74fbdcd74abc1bac6846ec92f00d21fe8f87610b;p=thirdparty%2FPython%2Fcpython.git

gh-121785: Remove unused code from codecs.py (GH-121787)

It was only needed for non-Unicode Python builds,
which aren't supported anymore.
---

diff --git a/Lib/codecs.py b/Lib/codecs.py
index a887e5d4c94a..e365e6cf2292 100644
--- a/Lib/codecs.py
+++ b/Lib/codecs.py
@@ -1109,21 +1109,12 @@ def make_encoding_map(decoding_map):
 
 ### error handlers
 
-try:
-    strict_errors = lookup_error("strict")
-    ignore_errors = lookup_error("ignore")
-    replace_errors = lookup_error("replace")
-    xmlcharrefreplace_errors = lookup_error("xmlcharrefreplace")
-    backslashreplace_errors = lookup_error("backslashreplace")
-    namereplace_errors = lookup_error("namereplace")
-except LookupError:
-    # In --disable-unicode builds, these error handler are missing
-    strict_errors = None
-    ignore_errors = None
-    replace_errors = None
-    xmlcharrefreplace_errors = None
-    backslashreplace_errors = None
-    namereplace_errors = None
+strict_errors = lookup_error("strict")
+ignore_errors = lookup_error("ignore")
+replace_errors = lookup_error("replace")
+xmlcharrefreplace_errors = lookup_error("xmlcharrefreplace")
+backslashreplace_errors = lookup_error("backslashreplace")
+namereplace_errors = lookup_error("namereplace")
 
 # Tell modulefinder that using codecs probably needs the encodings
 # package