← 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-06 06:48:25 UTC
  • mfrom: (4070.8.6 debug-config)
  • Revision ID: pqm@pqm.ubuntu.com-20090306064825-kbpwggw21dygeix6
(mbp) debug_flags configuration option

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smtp_connection.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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""A convenience class around smtplib."""
18
18
 
23
23
 
24
24
from bzrlib import (
25
25
    config,
26
 
    osutils,
 
26
    ui,
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
 
        # 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)
 
114
        self._connection.login(self._smtp_username, self._smtp_password)
122
115
 
123
116
    @staticmethod
124
117
    def get_message_addresses(message):