Mercurial > p > roundup > code
comparison roundup/roundupdb.py @ 7692:8fb42f41ef10 issue2550923_computed_property
merge in default branch to see if ti clears a travis-ci build error on 2.7 python; default branch builds fine
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Mon, 11 Sep 2023 00:10:29 -0400 |
| parents | 2b0089104f08 |
| children | 216662fbaaee |
comparison
equal
deleted
inserted
replaced
| 7528:14a8e11f3a87 | 7692:8fb42f41ef10 |
|---|---|
| 575 # now send one or more messages | 575 # now send one or more messages |
| 576 # TODO: I believe we have to create a new message each time as we | 576 # TODO: I believe we have to create a new message each time as we |
| 577 # can't fiddle the recipients in the message ... worth testing | 577 # can't fiddle the recipients in the message ... worth testing |
| 578 # and/or fixing some day | 578 # and/or fixing some day |
| 579 first = True | 579 first = True |
| 580 for sendto in sendto: | 580 for to_addr in sendto: |
| 581 # create the message | 581 # create the message |
| 582 mailer = Mailer(self.db.config) | 582 mailer = Mailer(self.db.config) |
| 583 | 583 |
| 584 message = mailer.get_standard_message(multipart=message_files) | 584 message = mailer.get_standard_message(multipart=message_files) |
| 585 | 585 |
| 719 | 719 |
| 720 else: | 720 else: |
| 721 message.set_payload(body, message.get_charset()) | 721 message.set_payload(body, message.get_charset()) |
| 722 | 722 |
| 723 if crypt: | 723 if crypt: |
| 724 send_msg = self.encrypt_to(message, sendto) | 724 send_msg = self.encrypt_to(message, to_addr) |
| 725 else: | 725 else: |
| 726 send_msg = message | 726 send_msg = message |
| 727 mailer.set_message_attributes(send_msg, sendto, subject, author) | 727 mailer.set_message_attributes(send_msg, to_addr, subject, author) |
| 728 if crypt: | 728 if crypt: |
| 729 send_msg['Message-Id'] = message['Message-Id'] | 729 send_msg['Message-Id'] = message['Message-Id'] |
| 730 send_msg['Reply-To'] = message['Reply-To'] | 730 send_msg['Reply-To'] = message['Reply-To'] |
| 731 if message.get('In-Reply-To'): | 731 if message.get('In-Reply-To'): |
| 732 send_msg['In-Reply-To'] = message['In-Reply-To'] | 732 send_msg['In-Reply-To'] = message['In-Reply-To'] |
| 733 | 733 |
| 734 if sendto: | 734 if to_addr: |
| 735 mailer.smtp_send(sendto, send_msg.as_string()) | 735 mailer.smtp_send(to_addr, send_msg.as_string()) |
| 736 if first: | 736 if first: |
| 737 if crypt: | 737 if crypt: |
| 738 # send individual bcc mails, otherwise receivers can | 738 # send individual bcc mails, otherwise receivers can |
| 739 # deduce bcc recipients from keys in message | 739 # deduce bcc recipients from keys in message |
| 740 for bcc in bcc_sendto: | 740 for bcc in bcc_sendto: |