[Python-checkins] python/dist/src/Lib codecs.py,1.35.2.2,1.35.2.3

loewis at users.sourceforge.net loewis at users.sourceforge.net
Tue Mar 8 16:05:47 CET 2005


Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26176/Lib

Modified Files:
      Tag: release24-maint
	codecs.py 
Log Message:
Build with --disable-unicode again. Fixes #1158607.


Index: codecs.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/codecs.py,v
retrieving revision 1.35.2.2
retrieving revision 1.35.2.3
diff -u -d -r1.35.2.2 -r1.35.2.3
--- codecs.py	10 Jan 2005 12:26:00 -0000	1.35.2.2
+++ codecs.py	8 Mar 2005 15:05:14 -0000	1.35.2.3
@@ -720,11 +720,19 @@
 
 ### error handlers
 
-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")
+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")
+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
 
 # Tell modulefinder that using codecs probably needs the encodings
 # package



More information about the Python-checkins mailing list