--- py-2.3.5/lib/python2.3/warnings.py	2006-06-06 13:51:24.000000000 -0700
+++ fixup/fixupfiles/warnings.py	2006-06-20 14:56:45.000000000 -0700
@@ -251,4 +251,4 @@
 # Module initialization
 _processoptions(sys.warnoptions)
 simplefilter("ignore", category=OverflowWarning, append=1)
-simplefilter("ignore", category=PendingDeprecationWarning, append=1)
+#simplefilter("ignore", category=PendingDeprecationWarning, append=1)
--- py-2.3.5/lib/python2.3/codecs.py	2006-06-06 13:51:20.000000000 -0700
+++ fixup/fixupfiles/codecs.py	2006-06-20 15:32:54.000000000 -0700
@@ -689,11 +689,11 @@
 
 ### 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")
+#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")
 
 # Tell modulefinder that using codecs probably needs the encodings
 # package
--- py-2.3.5/lib/python2.3/encodings/__init__.py	2006-06-06 13:51:36.000000000 -0700
+++ fixup/fixupfiles/encodings/__init__.py	2006-06-20 14:56:44.000000000 -0700
@@ -26,7 +26,6 @@
 (c) Copyright CNRI, All Rights Reserved. NO WARRANTY.
 
 """#"
-
 import codecs, exceptions, types
 
 _cache = {}
@@ -58,7 +57,7 @@
     """
     # Make sure we have an 8-bit string, because .translate() works
     # differently for Unicode strings.
-    if type(encoding) is types.UnicodeType:
+    if (type(encoding) is types.UnicodeType) and (encoding != 'latin-1'):
         # Note that .encode('latin-1') does *not* use the codec
         # registry, so this call doesn't recurse. (See unicodeobject.c
         # PyUnicode_AsEncodedString() for details)