/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/mail_client.py

  • Committer: Robert Collins
  • Date: 2009-05-23 20:57:12 UTC
  • mfrom: (4371 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4441.
  • Revision ID: robertc@robertcollins.net-20090523205712-lcwbfqk6vwavinuv
Merge .dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mail_client.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
import errno
18
18
import os
267
267
            message_options.extend(['-a',
268
268
                self._encode_path(attach_path, 'attachment')])
269
269
        if to is not None:
270
 
            message_options.append(self._encode_safe(to))
 
270
            message_options.extend(['--', self._encode_safe(to)])
271
271
        return message_options
272
272
mail_client_registry.register('mutt', Mutt,
273
273
                              help=Mutt.__doc__)
485
485
    """Default Windows mail client launched using MAPI."""
486
486
 
487
487
    def _compose(self, prompt, to, subject, attach_path, mime_subtype,
488
 
                 extension, body):
 
488
                 extension, body=None):
489
489
        """See ExternalMailClient._compose.
490
490
 
491
491
        This implementation uses MAPI via the simplemapi ctypes wrapper