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).

diff --git a/Lib/encodings/base64_codec.py b/Lib/encodings/base64_codec.py
index ce21b1a4b298888114c8c0d4b2817018e287b382..bae9542ad5225afbc46e6dcdf88a37375e936641 100644 (file)
--- a/Lib/encodings/base64_codec.py
+++ b/Lib/encodings/base64_codec.py
@@ -44,8 +44,10 @@ def base64_decode(input,errors='strict'):
 
 class Codec(codecs.Codec):
 
-    encode = base64_encode
-    decode = base64_decode
+    def encode(self, input,errors='strict'):
+        return base64_encode(input,errors)
+    def decode(self, input,errors='strict'):
+        return base64_decode(input,errors)
 
 class StreamWriter(Codec,codecs.StreamWriter):
     pass

diff --git a/Lib/encodings/hex_codec.py b/Lib/encodings/hex_codec.py
index ab7d86fc5060bf2fcceeb9d768d162bc4e3c27f6..572ff79eb82fb0d82bdb1694d0eca85d4d302a9d 100644 (file)
--- a/Lib/encodings/hex_codec.py
+++ b/Lib/encodings/hex_codec.py
@@ -44,8 +44,10 @@ def hex_decode(input,errors='strict'):
 
 class Codec(codecs.Codec):
 
-    encode = hex_encode
-    decode = hex_decode
+    def encode(self, input,errors='strict'):
+        return hex_encode(input,errors)
+    def decode(self, input,errors='strict'):
+        return hex_decode(input,errors)
 
 class StreamWriter(Codec,codecs.StreamWriter):
     pass

diff --git a/Lib/encodings/quopri_codec.py b/Lib/encodings/quopri_codec.py
index 42074f4a09ca4603901c77c6b4bf70de59f7287b..d98b5ed04bf5b0944ed97658ed79936ae9dd69ee 100644 (file)
--- a/Lib/encodings/quopri_codec.py
+++ b/Lib/encodings/quopri_codec.py
@@ -41,8 +41,10 @@ def quopri_decode(input, errors='strict'):
 
 class Codec(codecs.Codec):
 
-    encode = quopri_encode
-    decode = quopri_decode
+    def encode(self, input,errors='strict'):
+        return quopri_encode(input,errors)
+    def decode(self, input,errors='strict'):
+        return quopri_decode(input,errors)
 
 class StreamWriter(Codec, codecs.StreamWriter):
     pass

diff --git a/Lib/encodings/uu_codec.py b/Lib/encodings/uu_codec.py
index 82e799c9c841ce7768cd306345e1664f23f5b51f..6ef8369d53c615b5e4b4ea7dd41990fa707806fe 100644 (file)
--- a/Lib/encodings/uu_codec.py
+++ b/Lib/encodings/uu_codec.py
@@ -94,9 +94,11 @@ def uu_decode(input,errors='strict'):
 
 class Codec(codecs.Codec):
 
-    encode = uu_encode
-    decode = uu_decode
-
+    def encode(self,input,errors='strict'):
+        return uu_encode(input,errors)
+    def decode(self,input,errors='strict'):
+        return uu_decode(input,errors)
+    
 class StreamWriter(Codec,codecs.StreamWriter):
     pass
         

diff --git a/Lib/encodings/zlib_codec.py b/Lib/encodings/zlib_codec.py
index 035bb0480a6ee6e14919135eca109cbc2d2efe3e..d9f7d043cedc5bf8254bf8f2cdd1cc92c2021357 100644 (file)
--- a/Lib/encodings/zlib_codec.py
+++ b/Lib/encodings/zlib_codec.py
@@ -45,8 +45,10 @@ def zlib_decode(input,errors='strict'):
 
 class Codec(codecs.Codec):
 
-    encode = zlib_encode
-    decode = zlib_decode
+    def encode(self, input, errors='strict'):
+        return zlib_encode(input, errors)
+    def decode(self, input, errors='strict'):
+        return zlib_decode(input, errors)
 
 class StreamWriter(Codec,codecs.StreamWriter):
     pass