From: Barry Warsaw <barry@python.org>
Date: Tue, 23 Jul 2002 06:08:10 +0000 (+0000)
Subject: append(): Bite the bullet and let charset be the string name of a
X-Git-Tag: v2.3c1~4888
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=92825a9a525c268b9797b8be28dbd959b64a821d;p=thirdparty%2FPython%2Fcpython.git

append(): Bite the bullet and let charset be the string name of a
character set, which we'll convert to a Charset instance.  Sigh.
---

diff --git a/Lib/email/Header.py b/Lib/email/Header.py
index e691c3cb0e97..2457279013bf 100644
--- a/Lib/email/Header.py
+++ b/Lib/email/Header.py
@@ -188,12 +188,15 @@ class Header:
     def append(self, s, charset=None):
         """Append string s with Charset charset to the MIME header.
 
-        charset defaults to the one given in the class constructor.  If
-        charset is given, it should be an instance of Charset (not a character
-        set name string!).
+        If charset is given, it should be a Charset instance, or the name of a
+        character set (which will be converted to a Charset instance).  A
+        value of None (the default) means charset is the one given in the
+        class constructor.
         """
         if charset is None:
             charset = self._charset
+        elif not isinstance(charset, Charset):
+            charset = Charset(charset)
         self._chunks.append((s, charset))
 
     def _split(self, s, charset, firstline=0):