/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-01-30 00:49:41 UTC
  • mto: (3982.1.1 bzr.integration)
  • mto: This revision was merged to the branch mainline in revision 3983.
  • Revision ID: v.ladeuil+lp@free.fr-20090130004941-820fpd2ryyo127vv
Add more tests, fix pycurl double handling, revert previous tracking.

* bzrlib/tests/test_http.py:
(PredefinedRequestHandler): Renamed from
PreRecordedRequestHandler.
(PredefinedRequestHandler.handle_one_request): Get the canned
response from the test server directly.
(ActivityServerMixin): Make it a true object and intialize the
attributes in the constructor. Tests can now set the
canned_response attribute before querying the server.
(TestActivity.setUp, TestActivity.tearDown,
TestActivity.get_transport, TestActivity.assertActivitiesMatch):
Extracted from test_get to be able to write other tests.
(TestActivity.test_has, TestActivity.test_readv,
TestActivity.test_post): New tests, all cases should be covered
now.

* bzrlib/transport/http/response.py:
(RangeFile.__init__, RangeFile.read, handle_response): Revert
previous tracking, both http implementations can now report
activity from the socket.

* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._get_ranged, PyCurlTransport._post): Revert
previous tracking.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smtp_connection.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""A convenience class around smtplib."""
18
18
 
23
23
 
24
24
from bzrlib import (
25
25
    config,
26
 
    osutils,
 
26
    ui,
27
27
    )
28
28
from bzrlib.errors import (
29
29
    NoDestinationAddress,
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
117
111
            self._smtp_password = auth.get_password(
118
112
                'smtp', self._smtp_server, self._smtp_username)
119
113
 
120
 
        # smtplib requires that the username and password be byte
121
 
        # strings.  The CRAM-MD5 spec doesn't give any guidance on
122
 
        # encodings, but the SASL PLAIN spec says UTF-8, so that's
123
 
        # what we'll use.
124
 
        username = osutils.safe_utf8(self._smtp_username)
125
 
        password = osutils.safe_utf8(self._smtp_password)
126
 
 
127
 
        self._connection.login(username, password)
 
114
        self._connection.login(self._smtp_username, self._smtp_password)
128
115
 
129
116
    @staticmethod
130
117
    def get_message_addresses(message):