Rev 4296: (Neil Martinsen-Burrell) Fix 'bzr send' using MAPI. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4296
revision-id: pqm at pqm.ubuntu.com-20090416170746-92fj72e2i2qpkojj
parent: pqm at pqm.ubuntu.com-20090416152500-83w2bul0hwhhm7gd
parent: nmb at wartburg.edu-20090411144033-d6sh2mmo0153uxvv
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-04-16 18:07:46 +0100
message:
  (Neil Martinsen-Burrell) Fix 'bzr send' using MAPI.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/mail_client.py          mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
    ------------------------------------------------------------
    revno: 4282.2.4
    revision-id: nmb at wartburg.edu-20090411144033-d6sh2mmo0153uxvv
    parent: nmb at wartburg.edu-20090411040033-kyr7g9ii534mdftk
    committer: Neil Martinsen-Burrell <nmb at wartburg.edu>
    branch nick: fix_mapi_send
    timestamp: Sat 2009-04-11 09:40:33 -0500
    message:
      a better fix that doesn't break backwards compatibility
    modified:
      bzrlib/mail_client.py          mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
    ------------------------------------------------------------
    revno: 4282.2.3
    revision-id: nmb at wartburg.edu-20090411040033-kyr7g9ii534mdftk
    parent: nmb at wartburg.edu-20090411035903-01s20uw48m7ogal4
    committer: Neil Martinsen-Burrell <nmb at wartburg.edu>
    branch nick: fix_mapi_send
    timestamp: Fri 2009-04-10 23:00:33 -0500
    message:
      noted in NEWS
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 4282.2.2
    revision-id: nmb at wartburg.edu-20090411035903-01s20uw48m7ogal4
    parent: nmb at wartburg.edu-20090410183244-9msd41sa6qqk41cb
    committer: Neil Martinsen-Burrell <nmb at wartburg.edu>
    branch nick: fix_mapi_send
    timestamp: Fri 2009-04-10 22:59:03 -0500
    message:
      possibly better wording
    modified:
      bzrlib/mail_client.py          mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
    ------------------------------------------------------------
    revno: 4282.2.1
    revision-id: nmb at wartburg.edu-20090410183244-9msd41sa6qqk41cb
    parent: pqm at pqm.ubuntu.com-20090410005355-gbvyv8ghdgx5h480
    committer: Neil Martinsen-Burrell <nmb at wartburg.edu>
    branch nick: fix_mapi_send
    timestamp: Fri 2009-04-10 13:32:44 -0500
    message:
      possible fix?
    modified:
      bzrlib/mail_client.py          mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
=== modified file 'NEWS'
--- a/NEWS	2009-04-15 08:20:33 +0000
+++ b/NEWS	2009-04-16 17:07:46 +0000
@@ -38,6 +38,9 @@
 * End-Of-Line content filters are now loaded correctly.
   (Ian Clatworthy, Brian de Alwis, #355280)
 
+* ``bzr send`` works to send emails again using MAPI.
+  (Neil Martinsen-Burrell, #346998)
+
 * Non-recursive ``bzr ls`` now works properly when a path is specified.
   (Jelmer Vernooij, #357863)
 

=== modified file 'bzrlib/mail_client.py'
--- a/bzrlib/mail_client.py	2009-04-15 13:23:23 +0000
+++ b/bzrlib/mail_client.py	2009-04-16 17:07:46 +0000
@@ -485,7 +485,7 @@
     """Default Windows mail client launched using MAPI."""
 
     def _compose(self, prompt, to, subject, attach_path, mime_subtype,
-                 extension, body):
+                 extension, body=None):
         """See ExternalMailClient._compose.
 
         This implementation uses MAPI via the simplemapi ctypes wrapper