diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2013-06-10 10:16:24 +0800 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2013-06-10 10:16:24 +0800 |
| commit | e7353352191516e45d21f9814375a92cc7f602dc (patch) | |
| tree | 3c0aab82d62cba39084138674465af09634f7839 /apps/patchwork/models.py | |
| parent | 2f0eb64a6d543b26aa0a38ff1d5a09389a5b2f5c (diff) | |
| download | patchwork-e7353352191516e45d21f9814375a92cc7f602dc.tar.bz2 patchwork-e7353352191516e45d21f9814375a92cc7f602dc.tar.xz | |
models: Fix invalid dates in patch mbox
Currently, the Date header in mbox views is incorrect;
datetime.datetime.utctimetuple assumes that the date is in the local
timezone, but we keep all dates as UTC.
This change replaces utctimetuple with a manual calculation of the
seconds-since-epoch timestamp, which email.utils.formatdate requires. We
add a testcase for this too.
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'apps/patchwork/models.py')
| -rw-r--r-- | apps/patchwork/models.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/patchwork/models.py b/apps/patchwork/models.py index a9e70ce..250ad01 100644 --- a/apps/patchwork/models.py +++ b/apps/patchwork/models.py @@ -279,10 +279,12 @@ class Patch(models.Model): if self.content: body += '\n' + self.content + utc_timestamp = (self.date - + datetime.datetime.utcfromtimestamp(0)).total_seconds() + mail = PatchMbox(body) mail['Subject'] = self.name - mail['Date'] = email.utils.formatdate( - time.mktime(self.date.utctimetuple())) + mail['Date'] = email.utils.formatdate(utc_timestamp) mail['From'] = email.utils.formataddr(( str(Header(self.submitter.name, mail.patch_charset)), self.submitter.email)) |