Patch #462635 by Andrew Kuchling correcting bugs in the new

codecs -- the self argument does matter for Python functions (it
does not for C functions which most other codecs use).

Lib/encodings/base64_codec.py

@@ -44,8 +44,10 @@ def base64_decode(input,errors='strict'):
 
 class Codec(codecs.Codec):
 
-    encode = base64_encode
+    def encode(self, input,errors='strict'):
-    decode = base64_decode
+        return base64_encode(input,errors)
+    def decode(self, input,errors='strict'):
+        return base64_decode(input,errors)
 
 class StreamWriter(Codec,codecs.StreamWriter):
     pass

Lib/encodings/hex_codec.py

@@ -44,8 +44,10 @@ def hex_decode(input,errors='strict'):
 
 class Codec(codecs.Codec):
 
-    encode = hex_encode
+    def encode(self, input,errors='strict'):
-    decode = hex_decode
+        return hex_encode(input,errors)
+    def decode(self, input,errors='strict'):
+        return hex_decode(input,errors)
 
 class StreamWriter(Codec,codecs.StreamWriter):
     pass

Lib/encodings/quopri_codec.py

@@ -41,8 +41,10 @@ def quopri_decode(input, errors='strict'):
 
 class Codec(codecs.Codec):
 
-    encode = quopri_encode
+    def encode(self, input,errors='strict'):
-    decode = quopri_decode
+        return quopri_encode(input,errors)
+    def decode(self, input,errors='strict'):
+        return quopri_decode(input,errors)
 
 class StreamWriter(Codec, codecs.StreamWriter):
     pass

Lib/encodings/uu_codec.py

@@ -94,8 +94,10 @@ def uu_decode(input,errors='strict'):
 
 class Codec(codecs.Codec):
 
-    encode = uu_encode
+    def encode(self,input,errors='strict'):
-    decode = uu_decode
+        return uu_encode(input,errors)
+    def decode(self,input,errors='strict'):
+        return uu_decode(input,errors)
     
 class StreamWriter(Codec,codecs.StreamWriter):
     pass

Lib/encodings/zlib_codec.py

@@ -45,8 +45,10 @@ def zlib_decode(input,errors='strict'):
 
 class Codec(codecs.Codec):
 
-    encode = zlib_encode
+    def encode(self, input, errors='strict'):
-    decode = zlib_decode
+        return zlib_encode(input, errors)
+    def decode(self, input, errors='strict'):
+        return zlib_decode(input, errors)
 
 class StreamWriter(Codec,codecs.StreamWriter):
     pass