aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman/Handlers/Scrubber.py
diff options
context:
space:
mode:
authorYasuhito FUTATSUKI at POEM <futatuki@poem.co.jp>2019-01-08 15:25:41 +0900
committerYasuhito FUTATSUKI at POEM <futatuki@poem.co.jp>2019-01-08 15:25:41 +0900
commitd8ee0235efb4052d0e489ba1dba0af812873df14 (patch)
tree021691a2f050722fba1b157affeb5730f270009d /Mailman/Handlers/Scrubber.py
parentf63b5341247ff89ebad4ce6e13d8a90410e2bd12 (diff)
parent189515c4d3f1ed52b83d63577ebefec5c991b281 (diff)
downloadmailman2-d8ee0235efb4052d0e489ba1dba0af812873df14.tar.gz
mailman2-d8ee0235efb4052d0e489ba1dba0af812873df14.tar.xz
mailman2-d8ee0235efb4052d0e489ba1dba0af812873df14.zip
merge lp:mailman/2.1 up to rev 1805
Diffstat (limited to 'Mailman/Handlers/Scrubber.py')
-rw-r--r--Mailman/Handlers/Scrubber.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/Mailman/Handlers/Scrubber.py b/Mailman/Handlers/Scrubber.py
index 429312be..97e443b7 100644
--- a/Mailman/Handlers/Scrubber.py
+++ b/Mailman/Handlers/Scrubber.py
@@ -87,6 +87,9 @@ def guess_extension(ctype, ext):
all = guess_all_extensions(ctype, strict=False)
if ext in all:
return ext
+ if ctype.lower == 'application/octet-stream':
+ # For this type, all[0] is '.obj'. '.bin' is better.
+ return '.bin'
return all and all[0]