[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 1135: -
From:       noreply () launchpad ! net
Date:       2010-12-04 21:26:31
Message-ID: 20101204212631.15103.72457.launchpad () loganberry ! canonical ! com
[Download RAW message or body]

------------------------------------------------------------
revno: 1135
committer: Mark Sapiro <msapiro@value.net>
branch nick: 2.2
timestamp: Sat 2010-12-04 13:22:32 -0800
message:
   - Fixed a problem where an emailed command in the Subject: header with a
     non-ascii l10n of an 'Re:' prefix is ignored.  Bug #685261.
  =

   - Fixed a problem with approving a post by email when the body of the
     approval mail is base64 encoded.  Bug #677115.
modified:
  Mailman/MailList.py
  Mailman/Queue/CommandRunner.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" (text/x-diff)]

=== modified file 'Mailman/MailList.py'
--- Mailman/MailList.py	2010-06-30 14:34:30 +0000
+++ Mailman/MailList.py	2010-12-04 21:22:32 +0000
@@ -1300,7 +1300,7 @@
                     except IndexError:
                         subpart = None
                     if subpart:
-                        s = StringIO(subpart.get_payload())
+                        s = StringIO(subpart.get_payload(decode=True))
                         while True:
                             line = s.readline()
                             if not line:
@@ -1309,8 +1309,8 @@
                                 continue
                             i = line.find(':')
                             if i > 0:
-                                if (line[:i].lower() == 'approve' or
-                                    line[:i].lower() == 'approved'):
+                                if (line[:i].strip().lower() == 'approve' or
+                                    line[:i].strip().lower() == 'approved'):
                                     # then
                                     approved = line[i+1:].strip()
                             break

=== modified file 'Mailman/Queue/CommandRunner.py'
--- Mailman/Queue/CommandRunner.py	2009-08-05 18:56:03 +0000
+++ Mailman/Queue/CommandRunner.py	2010-12-04 21:22:32 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2009 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2010 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
@@ -76,7 +76,8 @@
         try:
             subj = make_header(decode_header(subj)).__unicode__()
             # TK: Currently we don't allow 8bit or multibyte in mail command.
-            subj = subj.encode('us-ascii')
+            # MAS: However, an l10n 'Re:' may contain non-ascii so ignore it.
+            subj = subj.encode('us-ascii', 'ignore')
             # Always process the Subject: header first
             self.commands.append(subj)
         except (HeaderParseError, UnicodeError, LookupError):

=== modified file 'NEWS'
--- NEWS	2010-11-04 17:19:43 +0000
+++ NEWS	2010-12-04 21:22:32 +0000
@@ -83,6 +83,12 @@
 
   Bug Fixes and other patches
 
+    - Fixed a problem where an emailed command in the Subject: header with a
+      non-ascii l10n of an 'Re:' prefix is ignored.  Bug #685261.
+
+    - Fixed a problem with approving a post by email when the body of the
+      approval mail is base64 encoded.  Bug #677115.
+
     - Fixed the host name in the From: address of the owner notification from
       bin/add_members.  Bug #666181.
 



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



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