[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mailman-cvs
Subject:    [Mailman-checkins] [Branch ~mailman-coders/mailman/2.2] Rev 1362: Fixed a UnicodeDecodeError that co
From:       noreply () launchpad ! net
Date:       2014-11-28 4:28:25
Message-ID: 20141128042825.28848.79269.launchpad () ackee ! canonical ! com
[Download RAW message or body]

------------------------------------------------------------
revno: 1362
committer: Mark Sapiro <mark@msapiro.net>
branch nick: 2.2
timestamp: Thu 2014-11-27 20:26:35 -0800
message:
  Fixed a UnicodeDecodeError that coud occur in the web admin interface
  if 'text' valued attributes have unicode values.
modified:
  Mailman/htmlformat.py
  NEWS


--
lp:mailman/2.2
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-c=
oders/mailman/2.2/+edit-subscription

["revision-diff.txt" (revision-diff.txt)]

=== modified file 'Mailman/htmlformat.py'
--- Mailman/htmlformat.py	2014-06-09 22:07:53 +0000
+++ Mailman/htmlformat.py	2014-11-28 04:26:35 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2012 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 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
@@ -448,7 +448,10 @@
         if self.checked:
             output.append('CHECKED')
         output.append('>')
-        return SPACE.join(output)
+        ret = SPACE.join(output)
+        if self.type == 'TEXT' and not isinstance(ret, str):
+            ret = repr(ret)
+        return ret
 
 
 class SubmitButton(InputObj):
@@ -496,6 +499,8 @@
         if self.readonly:
             output += ' READONLY'
         output += '>%s</TEXTAREA>' % self.text
+        if not isinstance(output, str):
+            output = repr(output)
         return output
 
 class FileUpload(InputObj):

=== modified file 'NEWS'
--- NEWS	2014-11-08 01:22:26 +0000
+++ NEWS	2014-11-28 04:26:35 +0000
@@ -77,6 +77,9 @@
 
   Bug fixes and other patches
 
+    - Fixed a UnicodeDecodeError that coud occur in the web admin interface
+      if 'text' valued attributes have unicode values.  (LP: #1397170)
+
     - We now catch the NotAMemberError exception thrown if an authenticated
       unsubscribe is submitted from the user options page for a nonmember.
       (LP: #1390653)



_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe: https://mail.python.org/mailman/options/mailman-checkins/mailman-cvs%40progressive-comp.com



[prev in list] [next in list] [prev in thread] [next in thread]