/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: Matt Nordhoff
  • Date: 2009-04-17 22:24:54 UTC
  • mto: This revision was merged to the branch mainline in revision 4314.
  • Revision ID: mnordhoff@mattnordhoff.com-20090417222454-frskxbd4w812ecnj
Restore Bazaar's customizations to configobj.py:

* Strip trailing whitespace

* Replace "has_key" with "in"

* Don't import the compiler module; it's slow and we don't need it

Other customizations Bazaar previously made have been merged upstream:

* Replace hasattr with getattr

* Don't use the deprecated "message" attribute on exceptions

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
 
            if self._smtp_username is None:
 
112
            self._smtp_username = auth.get_user('smtp', self._smtp_server, 
 
113
                default="")
 
114
            if self._smtp_username == "":
114
115
                return
115
116
 
116
117
        if self._smtp_password is None: