1
=== modified file 'lib/canonical/launchpad/database/message.py'
2
--- lib/canonical/launchpad/database/message.py	2011-02-17 17:02:54 +0000
3
+++ lib/canonical/launchpad/database/message.py	2011-03-08 21:52:53 +0000
4
@@ -14,7 +14,6 @@
5
14
    'UserToUserEmail',
14
    'UserToUserEmail',
6
15
    ]
15
    ]
7
16
16
8
17
9
18
from cStringIO import StringIO as cStringIO
17
from cStringIO import StringIO as cStringIO
10
19
from datetime import datetime
18
from datetime import datetime
11
20
import email
19
import email
12
@@ -29,6 +28,7 @@
13
29
    parsedate_tz,
28
    parsedate_tz,
14
30
    )
29
    )
15
31
from operator import attrgetter
30
from operator import attrgetter
16
31
import os.path
17
32
32
18
33
from lazr.config import as_timedelta
33
from lazr.config import as_timedelta
19
34
from lazr.enum import (
34
from lazr.enum import (
20
@@ -476,6 +476,8 @@
21
476
                    sequence += 1
476
                    sequence += 1
22
477
            else:
477
            else:
23
478
                filename = part.get_filename() or 'unnamed'
478
                filename = part.get_filename() or 'unnamed'
24
479
                # Strip off any path information.
25
480
                filename = os.path.basename(filename)
26
479
                # Note we use the Content-Type header instead of
481
                # Note we use the Content-Type header instead of
27
480
                # part.get_content_type() here to ensure we keep
482
                # part.get_content_type() here to ensure we keep
28
481
                # parameters as sent. If Content-Type is None we default
483
                # parameters as sent. If Content-Type is None we default
29
482
484
30
=== modified file 'lib/canonical/launchpad/database/tests/test_message.py'
31
--- lib/canonical/launchpad/database/tests/test_message.py	2010-11-06 12:50:22 +0000
32
+++ lib/canonical/launchpad/database/tests/test_message.py	2011-03-08 21:52:53 +0000
33
@@ -114,6 +114,33 @@
34
114
        transaction.commit()
114
        transaction.commit()
35
115
        self.assertEqual('This is the diff, honest.', diff.blob.read())
115
        self.assertEqual('This is the diff, honest.', diff.blob.read())
36
116
116
37
117
    def test_fromEmail_strips_attachment_paths(self):
38
118
        # Build a simple multipart message with a plain text first part
39
119
        # and an text/x-diff attachment.
40
120
        sender = self.factory.makePerson()
41
121
        msg = MIMEMultipart()
42
122
        msg['Message-Id'] = make_msgid('launchpad')
43
123
        msg['Date'] = formatdate()
44
124
        msg['To'] = 'to@example.com'
45
125
        msg['From'] = sender.preferredemail.email
46
126
        msg['Subject'] = 'Sample'
47
127
        msg.attach(MIMEText('This is the body of the email.'))
48
128
        attachment = Message()
49
129
        attachment.set_payload('This is the diff, honest.')
50
130
        attachment['Content-Type'] = 'text/x-diff'
51
131
        attachment['Content-Disposition'] = (
52
132
            'attachment; filename="/tmp/foo/review.diff"')
53
133
        msg.attach(attachment)
54
134
        # Now create the message from the MessageSet.
55
135
        message = MessageSet().fromEmail(msg.as_string())
56
136
        text, diff = message.chunks
57
137
        self.assertEqual('This is the body of the email.', text.content)
58
138
        self.assertEqual('review.diff', diff.blob.filename)
59
139
        self.assertEqual('text/x-diff', diff.blob.mimetype)
60
140
        # Need to commit in order to read back out of the librarian.
61
141
        transaction.commit()
62
142
        self.assertEqual('This is the diff, honest.', diff.blob.read())
63
143
64
117
144
65
118
class TestMessageJob(TestCaseWithFactory):
145
class TestMessageJob(TestCaseWithFactory):
66
119
    """Tests for MessageJob."""
146
    """Tests for MessageJob."""
Reviewer	Review Type	Date Requested	Status
Robert Collins (community)			Approve on 2011-03-06
Ian Booth (community)	*code	2011-03-04	Approve on 2011-03-04
Review via email: mp+52159@code.launchpad.net