From 0eac11826a6b9efed2f52b612e58046c584db573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Thu, 15 Jun 2006 06:45:05 +0000 Subject: [PATCH] Make import/lookup of mbcs fail on non-Windows systems. --- Lib/encodings/mbcs.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Lib/encodings/mbcs.py b/Lib/encodings/mbcs.py index a44ee7b6df2..ccf08e37176 100644 --- a/Lib/encodings/mbcs.py +++ b/Lib/encodings/mbcs.py @@ -7,6 +7,10 @@ which was written by Marc-Andre Lemburg (mal@lemburg.com). (c) Copyright CNRI, All Rights Reserved. NO WARRANTY. """ +# Import them explicitly to cause an ImportError +# on non-Windows systems +from codecs import mbcs_encode, mbcs_decode +# for IncrementalDecoder, IncrementalEncoder, ... import codecs ### Codec APIs @@ -15,16 +19,16 @@ class Codec(codecs.Codec): # Note: Binding these as C functions will result in the class not # converting them to methods. This is intended. - encode = codecs.mbcs_encode - decode = codecs.mbcs_decode + encode = mbcs_encode + decode = mbcs_decode class IncrementalEncoder(codecs.IncrementalEncoder): def encode(self, input, final=False): - return codecs.mbcs_encode(input,self.errors)[0] + return mbcs_encode(input,self.errors)[0] class IncrementalDecoder(codecs.BufferedIncrementalDecoder): def _buffer_decode(self, input, errors, final): - return codecs.mbcs_decode(input,self.errors,final) + return mbcs_decode(input,self.errors,final) class StreamWriter(Codec,codecs.StreamWriter): pass