Changeset 30385
- Timestamp:
- 12/07/05 16:44:16 (4 years ago)
- Files:
-
- CPSMailAccess/trunk/mailmessageeditview.py (modified) (2 diffs)
- CPSMailAccess/trunk/tests/test_mailmessageeditview.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
CPSMailAccess/trunk/mailmessageeditview.py
r28287 r30385 220 220 def _identyToMsgHeader(self): 221 221 """ takes a directory entry to fit it in From header """ 222 def cleanEntry(entry): 223 for element in (' ', '<', '>', ' '): 224 entry = entry.strip(element) 225 return entry 226 222 227 identities = self.getIdentitites() 223 228 if len(identities) > 0: … … 226 231 email = '?' 227 232 else: 228 email = identity['email'].strip() 233 email = cleanEntry(identity['email']) 234 229 235 if identity['fullname'] != '': 230 return '%s <%s>' %(identity['fullname'], email) 236 fullname = cleanEntry(identity['fullname']) 237 return '%s <%s>' %(fullname, email) 231 238 else: 232 239 return email CPSMailAccess/trunk/tests/test_mailmessageeditview.py
r28769 r30385 244 244 self.assertEquals(url, 'nowhere/INBOX/INBOX') 245 245 246 def test_identyToMsgHeader(self): 247 def getIdentitites(): 248 return ({'email': '< tz@nuxeo.com>', 'fullname': '<tarek> '},) 249 mailbox = self._getMailBox() 250 view = MailMessageEdit(mailbox, None) 251 view.getIdentitites = getIdentitites 252 253 msg_from = view._identyToMsgHeader() 254 self.assertEquals(msg_from, 'tarek <tz@nuxeo.com>') 255 246 256 def test_suite(): 247 257 return unittest.TestSuite((
