/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: Canonical.com Patch Queue Manager
  • Date: 2009-04-07 13:56:43 UTC
  • mfrom: (4241.6.9 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090407135643-r15qstzbwg87d2nq
(robertc) Add --development6-rich-root,
        disabling the legacy and unneeded development2 format,
        and activating the tests for CHK features disabled pending this format.
        (Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil)

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
70
67
        self._authenticate()
71
68
 
72
69
    def _create_connection(self):
106
103
        """If necessary authenticate yourself to the server."""
107
104
        auth = config.AuthenticationConfig()
108
105
        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
106
            self._smtp_username = auth.get_user('smtp', self._smtp_server)
113
107
            if self._smtp_username is None:
114
108
                return