--- /home/mailman/src/sf/mailman-2.2/misc/email-4.0a2/email/charset.py	Mon Mar  6 04:58:33 2006
+++ email/charset.py	Mon Mar  6 13:31:58 2006
@@ -258,10 +258,14 @@
         else:
             return encode_7or8bit
 
-    def convert(self, s):
+    def convert(self, s, errors='replace'):
         """Convert a string from the input_codec to the output_codec."""
         if self.input_codec <> self.output_codec:
-            return unicode(s, self.input_codec).encode(self.output_codec)
+            if not isinstance(s, unicode):
+                s = unicode(s, self.input_codec, errors)
+            return s.encode(self.output_codec, errors)
+        elif isinstance(s, unicode):
+            return s.encode(self.output_codec, errors)
         else:
             return s