/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/smtp_connection.py

  • Committer: Robert Collins
  • Date: 2010-05-06 11:08:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smtp_connection.py
109
109
            # FIXME: Since _authenticate gets called even when no authentication
110
110
            # is necessary, it's not possible to use the default username 
111
111
            # here yet.
112
 
            self._smtp_username = auth.get_user('smtp', self._smtp_server, 
113
 
                default="")
114
 
            if self._smtp_username == "":
 
112
            self._smtp_username = auth.get_user('smtp', self._smtp_server)
 
113
            if self._smtp_username is None:
115
114
                return
116
115
 
117
116
        if self._smtp_password is None: