diff options
author | Barry Warsaw <barry@python.org> | 2006-02-08 14:34:21 +0000 |
---|---|---|
committer | Barry Warsaw <barry@python.org> | 2006-02-08 14:34:21 +0000 |
commit | e58df82919808939f21e9756af65c5afb5d8b2e5 (patch) | |
tree | ebf1e42f435a305f4259a53b2d34675ff5f2bc1c /Lib/email/Charset.py | |
parent | a871ef2b3e924f058ec1b0aed7d4c83a546414b7 (diff) | |
download | cpython-git-e58df82919808939f21e9756af65c5afb5d8b2e5.tar.gz |
Port relevant patches for SF 1409455 to the trunk for email 3.0/Python 2.5.
Will port to Python 2.4.
Diffstat (limited to 'Lib/email/Charset.py')
-rw-r--r-- | Lib/email/Charset.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/email/Charset.py b/Lib/email/Charset.py index df860c5e5b..fd4043bb87 100644 --- a/Lib/email/Charset.py +++ b/Lib/email/Charset.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2004 Python Software Foundation +# Copyright (C) 2001-2006 Python Software Foundation # Author: Ben Gertzfield, Barry Warsaw # Contact: email-sig@python.org @@ -206,7 +206,7 @@ class Charset: self.input_codec = CODEC_MAP.get(self.input_charset, self.input_charset) self.output_codec = CODEC_MAP.get(self.output_charset, - self.output_charset) + self.output_charset) def __str__(self): return self.input_charset.lower() |