aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2016-03-10 17:53:32 -0800
committerMark Sapiro <mark@msapiro.net>2016-03-10 17:53:32 -0800
commit41a9b83a0d0a1253aeb5d7aa108852128de504ee (patch)
tree49ddd0f43bbd03d4b2c233bd07871702d6a3cbc2 /Mailman
parentb6a4156c595f57d0793bb2ac4bb4e093bd2cc4c7 (diff)
downloadmailman2-41a9b83a0d0a1253aeb5d7aa108852128de504ee.tar.gz
mailman2-41a9b83a0d0a1253aeb5d7aa108852128de504ee.tar.xz
mailman2-41a9b83a0d0a1253aeb5d7aa108852128de504ee.zip
Fixed _set_date() in pipermail.py do do a better job.
Diffstat (limited to 'Mailman')
-rw-r--r--Mailman/Archiver/pipermail.py26
1 files changed, 18 insertions, 8 deletions
diff --git a/Mailman/Archiver/pipermail.py b/Mailman/Archiver/pipermail.py
index 9c54bbd9..15decd40 100644
--- a/Mailman/Archiver/pipermail.py
+++ b/Mailman/Archiver/pipermail.py
@@ -16,6 +16,7 @@ __version__ = '0.09 (Mailman edition)'
VERSION = __version__
CACHESIZE = 100 # Number of slots in the cache
+from Mailman import mm_cfg
from Mailman import Errors
from Mailman.Mailbox import ArchiverMailbox
from Mailman.Logging.Syslog import syslog
@@ -230,21 +231,30 @@ class Article:
self.body = s.readlines()
def _set_date(self, message):
- def floatdate(header):
- missing = []
- datestr = message.get(header, missing)
- if datestr is missing:
+ def floatdate(datestr):
+ if not datestr:
return None
date = parsedate_tz(datestr)
try:
- return mktime_tz(date)
+ date = mktime_tz(date)
+ if (date < 0 or
+ date - time.time() >
+ mm_cfg.ARCHIVER_ALLOWABLE_SANE_DATE_SKEW
+ ):
+ return None
+ return date
except (TypeError, ValueError, OverflowError):
return None
- date = floatdate('date')
+ date = floatdate(message.get('date'))
+ if date is None:
+ date = floatdate(message.get('x-list-received-date'))
+ if date is None:
+ date = floatdate(re.sub(r'^.*;\s*', '',
+ message.get('received'), flags=re.S))
if date is None:
- date = floatdate('x-list-received-date')
+ date = floatdate(re.sub(r'From \s*\S+\s+', '',
+ message.get_unixfrom()))
if date is None:
- # What's left to try?
date = self._last_article_time + 1
self._last_article_time = date
self.date = '%011i' % date