From 26e3b681b26c9978c819396e278f43d356d86f9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lemburg?= Date: Thu, 20 Sep 2001 10:33:38 +0000 Subject: 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 | 6 ++++-- Lib/encodings/hex_codec.py | 6 ++++-- Lib/encodings/quopri_codec.py | 6 ++++-- Lib/encodings/uu_codec.py | 8 +++++--- Lib/encodings/zlib_codec.py | 6 ++++-- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/Lib/encodings/base64_codec.py b/Lib/encodings/base64_codec.py index ce21b1a..bae9542 100644 --- 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 ab7d86f..572ff79 100644 --- 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 42074f4..d98b5ed 100644 --- 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 82e799c..6ef8369 100644 --- 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 035bb04..d9f7d04 100644 --- 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 -- cgit v0.12