diff options
| author | Mark Sapiro <mark@msapiro.net> | 2008-12-19 12:23:41 -0800 |
|---|---|---|
| committer | Mark Sapiro <mark@msapiro.net> | 2008-12-19 12:23:41 -0800 |
| commit | 6dc49d3d22ea2c5fc839826bc2f9ee7ba362f2ca (patch) | |
| tree | f0b43f4278665bf7a6ada549b1c04b65b4a8032a /Mailman/Archiver | |
| parent | b0cdc157d624b90287308b7b83c4f603be3174b5 (diff) | |
| download | mailman2-6dc49d3d22ea2c5fc839826bc2f9ee7ba362f2ca.tar.gz mailman2-6dc49d3d22ea2c5fc839826bc2f9ee7ba362f2ca.tar.xz mailman2-6dc49d3d22ea2c5fc839826bc2f9ee7ba362f2ca.zip | |
Fixed an issue where in some circumstances HyperArch.py would translate
' at ' into the wrong language ultimately throwing a UnicodeDecodeError
when the translation was decoded with a different character set.
Bug #308152.
Diffstat (limited to 'Mailman/Archiver')
| -rw-r--r-- | Mailman/Archiver/HyperArch.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Mailman/Archiver/HyperArch.py b/Mailman/Archiver/HyperArch.py index d4fc5d9a..33a389ed 100644 --- a/Mailman/Archiver/HyperArch.py +++ b/Mailman/Archiver/HyperArch.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2007 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2008 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 @@ -574,8 +574,8 @@ class Article(pipermail.Article): if mm_cfg.ARCHIVER_OBSCURES_EMAILADDRS: otrans = i18n.get_translation() try: - atmark = unicode(_(' at '), cset) i18n.set_language(self._lang) + atmark = unicode(_(' at '), cset) body = re.sub(r'([-+,.\w]+)@([-+.\w]+)', '\g<1>' + atmark + '\g<2>', body) finally: |