Changeset 29 for branches

Show
Ignore:
Timestamp:
10/16/07 03:33:12 (1 year ago)
Author:
amcgregor
Message:

Applied a modified remove_insane_headers.2.patch as per ticket #15.

Location:
branches/2.0.5
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/2.0.5/tests/basic_tests.py

    r25 r29  
    7373                self.assertEqual([recipient], msginfo['recipients']) 
    7474                msg = email.message_from_string(msginfo['mail'])  
     75                self.failIf(msg.has_key('Old-Return-Path')) 
     76                self.failIf(msg.has_key('Return-Path')) 
    7577                assert 'Hello World' in msg.get_payload()  
    7678 

  • branches/2.0.5/turbomail/message.py

    r24 r29  
    296296                        if type(self.sender) == type([]) and len(self.sender) > 1: 
    297297                                message.add_header('Sender', self._normalize(self.sender[0])) 
    298                                 message.add_header('Return-Path', self._normalize(self.sender[0])) 
    299                         else: 
    300                                 message.add_header('Return-Path', self._normalize(self.sender)) 
    301298                else: 
    302                         message.add_header('Return-Path', self._normalize(self.sender)) 
    303299                        message.add_header('Sender', self._normalize(self.smtpfrom)) 
    304                         message.add_header('Return-Path', self._normalize(self.smtpfrom)) 
    305                         message.add_header('Old-Return-Path', self._normalize(self.smtpfrom)) 
    306300 
    307301                message.add_header('X-Mailer', "TurboMail TurboGears Extension v.%s" % release.version)