/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: Vincent Ladeuil
  • Date: 2009-04-02 10:43:01 UTC
  • mto: (4248.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 4249.
  • Revision ID: v.ladeuil+lp@free.fr-20090402104301-esvcd0lcqru9g4lb
Stop requiring a tty for CLIUIFactory and derivatives.

* bzrlib/ui/text.py:
(TextUIFactory.prompt):  Deleted, not needed anymore.

* bzrlib/ui/__init__.py:
(CLIUIFactory.get_boolean): Delegate terminal handling to
prompt().
(CLIUIFactory.get_non_echoed_password): Simplified.
(CLIUIFactory.get_password): Delegate terminal handling to
prompt().
(CLIUIFactory.prompt): Clear the terminal, builb, encode and
displays the prompt.
(SilentUIFactory.prompt): Update signature.

* bzrlib/tests/__init__.py:
(TestUIFactory.__init__): Simplified.
(TestUIFactory.get_non_echoed_password): No need for prompt here.

* errors.py:
(NotATerminal): Deleted.

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