/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: Andrew Bennetts
  • Date: 2009-04-27 23:14:00 UTC
  • mfrom: (4306 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4307.
  • Revision ID: andrew.bennetts@canonical.com-20090427231400-htifkzm2zvwp3lax
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smtp_connection.py
64
64
            return
65
65
 
66
66
        self._create_connection()
 
67
        # FIXME: _authenticate() should only be called when the server has
 
68
        # refused unauthenticated access, so it can safely try to authenticate 
 
69
        # with the default username. JRV20090407
67
70
        self._authenticate()
68
71
 
69
72
    def _create_connection(self):
103
106
        """If necessary authenticate yourself to the server."""
104
107
        auth = config.AuthenticationConfig()
105
108
        if self._smtp_username is None:
106
 
            self._smtp_username = auth.get_user('smtp', self._smtp_server)
107
 
            if self._smtp_username is None:
 
109
            # FIXME: Since _authenticate gets called even when no authentication
 
110
            # is necessary, it's not possible to use the default username 
 
111
            # here yet.
 
112
            self._smtp_username = auth.get_user('smtp', self._smtp_server, 
 
113
                default="")
 
114
            if self._smtp_username == "":
108
115
                return
109
116
 
110
117
        if self._smtp_password is None: