← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smtp_connection.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-03-25 18:43:31 UTC
  • mfrom: (4147.1.3 bzr.bug-338261)
  • Revision ID: pqm@pqm.ubuntu.com-20090325184331-1up3t0gh14ttr5zm
(James Henstridge) Insure that byte strings are passed to SMTP.login()

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smtp_connection.py
23
23
 
24
24
from bzrlib import (
25
25
    config,
26
 
    ui,
 
26
    osutils,
27
27
    )
28
28
from bzrlib.errors import (
29
29
    NoDestinationAddress,
111
111
            self._smtp_password = auth.get_password(
112
112
                'smtp', self._smtp_server, self._smtp_username)
113
113
 
114
 
        self._connection.login(self._smtp_username, self._smtp_password)
 
114
        # smtplib requires that the username and password be byte
 
115
        # strings.  The CRAM-MD5 spec doesn't give any guidance on
 
116
        # encodings, but the SASL PLAIN spec says UTF-8, so that's
 
117
        # what we'll use.
 
118
        username = osutils.safe_utf8(self._smtp_username)
 
119
        password = osutils.safe_utf8(self._smtp_password)
 
120
 
 
121
        self._connection.login(username, password)
115
122
 
116
123
    @staticmethod
117
124
    def get_message_addresses(message):