------------------------------------------------------------
revno: 1037
committer: Mark Sapiro <[email protected]>
branch nick: 2.2
timestamp: Thu 2009-02-12 18:52:31 -0800
message:
Merged change from 2.1 branch.
modified:
Mailman/Archiver/HyperArch.py
NEWS
------------------------------------------------------------
revno: 984.1.189
committer: Mark Sapiro <[email protected]>
branch nick: 2.1
timestamp: Thu 2009-02-12 18:38:01 -0800
message:
Worked around a potential problem in HyperArch.py with unicode character
set arguments. Bug #328353.
modified:
Mailman/Archiver/HyperArch.py
NEWS
=== modified file 'Mailman/Archiver/HyperArch.py'
--- Mailman/Archiver/HyperArch.py 2008-12-23 02:19:44 +0000
+++ Mailman/Archiver/HyperArch.py 2009-02-13 02:52:31 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2009 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -302,6 +302,9 @@
self.decoded = {}
cset = Utils.GetCharSet(mlist.preferred_language)
cset_out = Charset(cset).output_charset or cset
+ if isinstance(cset_out, unicode):
+ # email 3.0.1 (python 2.4) doesn't like unicode
+ cset_out = cset_out.encode('us-ascii')
charset = message.get_content_charset(cset_out)
if charset:
charset = charset.lower().strip()
=== modified file 'NEWS'
--- NEWS 2009-02-09 23:30:34 +0000
+++ NEWS 2009-02-13 02:52:31 +0000
@@ -136,6 +136,9 @@
- Changed Gui/Topics.py to validate regexps in VERBOSE mode. Bug #327008.
+ - Worked around a potential problem in HyperArch.py with unicode character
+ set arguments. Bug #328353.
+
i18n
- Updated Dutch, Catalan and Polish translations.
--
Active development version (web u/i update)
https://code.launchpad.net/~mailman-coders/mailman/2.2
Your team Mailman Checkins is subscribed to branch lp:mailman/2.2.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.2/+edit-subscription.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
