fix blank-title subject line handling [SF#1442121]

Author: Richard Jones

CHANGES.txt

@@ -14,6 +14,7 @@ Fixed:
 - incompatibility with python2.3 in the mailer module (sf bug 1432602)
 - typo in SMTP TLS option name: "MAIL_TLS_CERFILE" (sf bug 1435452)
 - email obfuscation code in html templating is more robust
+- fix blank-title subject line handling (sf bug 1442121)
 
 
 2006-02-10 1.1.0

roundup/mailgw.py

@@ -72,7 +72,7 @@ class node. Any parts of other types are each stored in separate files
 an exception, the original message is bounced back to the sender with the
 explanatory message given in the exception.
 
-$Id: mailgw.py,v 1.172 2006-01-25 03:51:21 richard Exp $
+$Id: mailgw.py,v 1.173 2006-03-02 23:45:22 richard Exp $
 """
 __docformat__ = 'restructuredtext'
 
@@ -647,7 +647,7 @@ def handle_message(self, message):
             # or fallback on the default class
             if self.db.config['EMAIL_REGISTRATION_CONFIRMATION']:
                 otk_re = re.compile('-- key (?P<otk>[a-zA-Z0-9]{32})')
-                otk = otk_re.search(m.group('title'))
+                otk = otk_re.search(m.group('title') or '')
                 if otk:
                     self.db.confirm_registration(otk.group('otk'))
                     subject = 'Your registration to %s is complete' % \

scripts/import_sf.py

@@ -254,33 +254,36 @@ def to_date(ts):
         else:
             d['status'] = unread
 
-        messages = []
         nosy = sets.Set()
         for message in artifact.get('messages', []):
-            message_id += 1
             authid = users[message['user_name']]
             if not message['body']: continue
             body = convert_message(message['body'], message_id)
             if not body: continue
             m = {'content': body, 'author': authid,
-                'date': message['adddate'], 'id': str(message_id),
+                'date': message['adddate'],
                 'creation': message['adddate'], }
             message_data.append(m)
-            messages.append(message_id)
             if authid not in (None, '2'):
                 nosy.add(authid)
             activity = message['adddate']
             actor = authid
             if d['status'] == unread:
                 d['status'] = chatting
 
-        message_id += 1
+        # add import message
         m = {'content': 'IMPORT FROM SOURCEFORGE', 'author': '1',
-            'date': today, 'id': str(message_id), 'creation': today }
+            'date': today, 'creation': today}
         message_data.append(m)
-        messages.append(message_id)
 
-        d['messages'] = messages
+        # sort messages and assign ids
+        d['messages'] = []
+        message_data.sort(lambda a,b:cmp(a['date'],b['date']))
+        for message in message_data:
+            message_id += 1
+            message['id'] = str(message_id)
+            d['messages'].append(message_id)
+
         d['nosy'] = list(nosy)
 
         files = []

test/test_mailgw.py

@@ -8,7 +8,7 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
-# $Id: test_mailgw.py,v 1.76 2005-10-07 04:42:13 richard Exp $
+# $Id: test_mailgw.py,v 1.77 2006-03-02 23:45:23 richard Exp $
 
 # TODO: test bcc
 
@@ -680,6 +680,26 @@ def testFollowupEmptyMessage(self):
 In-Reply-To: <dummy_test_message_id>
 Subject: [issue1] Testing... [assignedto=mary; nosy=+john]
 
+''')
+        l = self.db.issue.get('1', 'nosy')
+        l.sort()
+        self.assertEqual(l, [self.chef_id, self.richard_id, self.mary_id,
+            self.john_id])
+
+        # should be no file created (ie. no message)
+        assert not os.path.exists(SENDMAILDEBUG)
+
+    def testFollowupEmptyMessageNoSubject(self):
+        self.doNewIssue()
+
+        self._handle_mail('''Content-Type: text/plain;
+  charset="iso-8859-1"
+From: richard <richard@test>
+To: [email protected]
+Message-Id: <followup_dummy_id>
+In-Reply-To: <dummy_test_message_id>
+Subject: [issue1] [assignedto=mary; nosy=+john]
+
 ''')
         l = self.db.issue.get('1', 'nosy')
         l.sort()