diff options
| author | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2016-07-17 06:39:50 +0900 |
|---|---|---|
| committer | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2016-07-17 06:39:50 +0900 |
| commit | 8a31986e68316d0a06919990abad096ee6c0e041 (patch) | |
| tree | 3d198ba9f0e4e17eaa242c3a4587ee6ec1ae852f /Mailman/htmlformat.py | |
| parent | 8cac32e5bac4495139573b07da94c255522e8498 (diff) | |
| parent | b17234a23a590d9b27f3f609781596eea27b6974 (diff) | |
| download | mailman2-8a31986e68316d0a06919990abad096ee6c0e041.tar.gz mailman2-8a31986e68316d0a06919990abad096ee6c0e041.tar.xz mailman2-8a31986e68316d0a06919990abad096ee6c0e041.zip | |
Merge lp:mailman/2.1 up to rev 1664
Diffstat (limited to '')
| -rwxr-xr-x | Mailman/htmlformat.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Mailman/htmlformat.py b/Mailman/htmlformat.py index 419fa296..2770eb60 100755 --- a/Mailman/htmlformat.py +++ b/Mailman/htmlformat.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2015 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2016 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 @@ -453,7 +453,7 @@ class InputObj: output.append('>') ret = SPACE.join(output) if self.type == 'TEXT' and isinstance(ret, unicode): - ret = ret.encode(charset, 'replace') + ret = ret.encode(charset, 'xmlcharrefreplace') return ret @@ -504,7 +504,7 @@ class TextArea: output += ' READONLY' output += '>%s</TEXTAREA>' % self.text if isinstance(output, unicode): - output = output.encode(charset, 'replace') + output = output.encode(charset, 'xmlcharrefreplace') return output class FileUpload(InputObj): |