Skip to content

Fix unclosed file ResourceWarnings in FileRecips and ToDigest #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thegushi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix unclosed file ResourceWarnings in FileRecips and ToDigest #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Mailman/Handlers/FileRecips.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ def process(mlist, msg, msgdata):
msgdata['recips'] = []
return
# Read all the lines out of the file, and strip them of the trailing nl
addrs = [line.strip() for line in fp.readlines()]
with fp:
addrs = [line.strip() for line in fp.readlines()]
# If the sender is in that list, remove him
sender = msg.get_sender()
if mlist.isMember(sender):
Expand Down
12 changes: 11 additions & 1 deletion Mailman/Handlers/ToDigest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,10 @@ def process(mlist, msg, msgdata):
try:
with open(mboxfile, 'a+b') as mboxfp:
mbox = Mailbox(mboxfp.name)
mbox.AppendMessage(msg)
try:
mbox.AppendMessage(msg)
finally:
mbox.close()
# Calculate the current size of the accumulation file. This will not tell
# us exactly how big the MIME, rfc1153, or any other generated digest
# message will be, but it's the most easily available metric to decide
Expand Down Expand Up @@ -155,6 +158,13 @@ def send_digests(mlist, mboxfp):

def send_i18n_digests(mlist, mboxfp):
mbox = Mailbox(mboxfp)
try:
_send_i18n_digests(mlist, mbox)
finally:
mbox.close()


def _send_i18n_digests(mlist, mbox):
# Prepare common information (first lang/charset)
lang = mlist.preferred_language
lcset = Utils.GetCharSet(lang)
Expand Down