/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/smart/client.py

  • Committer: Andrew Bennetts
  • Date: 2008-05-19 13:55:43 UTC
  • mto: This revision was merged to the branch mainline in revision 3439.
  • Revision ID: andrew.bennetts@canonical.com-20080519135543-bxni2f4106i9fwx7
Add two tests that fail without the fixes in this branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/client.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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
 
 
17
import urllib
16
18
 
17
19
import bzrlib
18
20
from bzrlib.smart import message, protocol
19
21
from bzrlib.trace import warning
20
 
from bzrlib import (
21
 
    errors,
22
 
    hooks,
23
 
    )
 
22
from bzrlib import urlutils, errors
24
23
 
25
24
 
26
25
class _SmartClient(object):
36
35
        else:
37
36
            self._headers = dict(headers)
38
37
 
39
 
    def __repr__(self):
40
 
        return '%s(%r)' % (self.__class__.__name__, self._medium)
41
 
 
42
38
    def _send_request(self, protocol_version, method, args, body=None,
43
 
                      readv_body=None, body_stream=None):
 
39
                      readv_body=None):
44
40
        encoder, response_handler = self._construct_protocol(
45
41
            protocol_version)
46
42
        encoder.set_headers(self._headers)
48
44
            if readv_body is not None:
49
45
                raise AssertionError(
50
46
                    "body and readv_body are mutually exclusive.")
51
 
            if body_stream is not None:
52
 
                raise AssertionError(
53
 
                    "body and body_stream are mutually exclusive.")
54
47
            encoder.call_with_body_bytes((method, ) + args, body)
55
48
        elif readv_body is not None:
56
 
            if body_stream is not None:
57
 
                raise AssertionError(
58
 
                    "readv_body and body_stream are mutually exclusive.")
59
 
            encoder.call_with_body_readv_array((method, ) + args, readv_body)
60
 
        elif body_stream is not None:
61
 
            encoder.call_with_body_stream((method, ) + args, body_stream)
 
49
            encoder.call_with_body_readv_array((method, ) + args,
 
50
                    readv_body)
62
51
        else:
63
52
            encoder.call(method, *args)
64
53
        return response_handler
65
54
 
66
 
    def _run_call_hooks(self, method, args, body, readv_body):
67
 
        if not _SmartClient.hooks['call']:
68
 
            return
69
 
        params = CallHookParams(method, args, body, readv_body, self._medium)
70
 
        for hook in _SmartClient.hooks['call']:
71
 
            hook(params)
72
 
 
73
55
    def _call_and_read_response(self, method, args, body=None, readv_body=None,
74
 
            body_stream=None, expect_response_body=True):
75
 
        self._run_call_hooks(method, args, body, readv_body)
 
56
            expect_response_body=True):
76
57
        if self._medium._protocol_version is not None:
77
58
            response_handler = self._send_request(
78
59
                self._medium._protocol_version, method, args, body=body,
79
 
                readv_body=readv_body, body_stream=body_stream)
 
60
                readv_body=readv_body)
80
61
            return (response_handler.read_response_tuple(
81
62
                        expect_body=expect_response_body),
82
63
                    response_handler)
83
64
        else:
84
65
            for protocol_version in [3, 2]:
85
 
                if protocol_version == 2:
86
 
                    # If v3 doesn't work, the remote side is older than 1.6.
87
 
                    self._medium._remember_remote_is_before((1, 6))
88
66
                response_handler = self._send_request(
89
67
                    protocol_version, method, args, body=body,
90
 
                    readv_body=readv_body, body_stream=body_stream)
 
68
                    readv_body=readv_body)
91
69
                try:
92
70
                    response_tuple = response_handler.read_response_tuple(
93
71
                        expect_body=expect_response_body)
100
78
                        % (protocol_version,))
101
79
                    self._medium.disconnect()
102
80
                    continue
103
 
                except errors.ErrorFromSmartServer:
104
 
                    # If we received an error reply from the server, then it
105
 
                    # must be ok with this protocol version.
106
 
                    self._medium._protocol_version = protocol_version
107
 
                    raise
108
81
                else:
109
82
                    self._medium._protocol_version = protocol_version
110
83
                    return response_tuple, response_handler
135
108
 
136
109
    def call_expecting_body(self, method, *args):
137
110
        """Call a method and return the result and the protocol object.
138
 
 
 
111
        
139
112
        The body can be read like so::
140
113
 
141
114
            result, smart_protocol = smart_client.call_expecting_body(...)
175
148
                args[0], args[1:], readv_body=body, expect_response_body=True)
176
149
        return (response, response_handler)
177
150
 
178
 
    def call_with_body_stream(self, args, stream):
179
 
        response, response_handler = self._call_and_read_response(
180
 
                args[0], args[1:], body_stream=stream,
181
 
                expect_response_body=False)
182
 
        return (response, response_handler)
183
 
 
184
151
    def remote_path_from_transport(self, transport):
185
152
        """Convert transport into a path suitable for using in a request.
186
 
 
 
153
        
187
154
        Note that the resulting remote path doesn't encode the host name or
188
155
        anything but path, so it is only safe to use it in requests sent over
189
156
        the medium from the matching transport.
190
157
        """
191
 
        return self._medium.remote_path_from_transport(transport)
192
 
 
193
 
 
194
 
class SmartClientHooks(hooks.Hooks):
195
 
 
196
 
    def __init__(self):
197
 
        hooks.Hooks.__init__(self)
198
 
        self.create_hook(hooks.HookPoint('call',
199
 
            "Called when the smart client is submitting a request to the "
200
 
            "smart server. Called with a bzrlib.smart.client.CallHookParams "
201
 
            "object. Streaming request bodies, and responses, are not "
202
 
            "accessible.", None, None))
203
 
 
204
 
 
205
 
_SmartClient.hooks = SmartClientHooks()
206
 
 
207
 
 
208
 
class CallHookParams(object):
209
 
 
210
 
    def __init__(self, method, args, body, readv_body, medium):
211
 
        self.method = method
212
 
        self.args = args
213
 
        self.body = body
214
 
        self.readv_body = readv_body
215
 
        self.medium = medium
216
 
 
217
 
    def __repr__(self):
218
 
        attrs = dict((k, v) for (k, v) in self.__dict__.iteritems()
219
 
                     if v is not None)
220
 
        return '<%s %r>' % (self.__class__.__name__, attrs)
221
 
 
222
 
    def __eq__(self, other):
223
 
        if type(other) is not type(self):
224
 
            return NotImplemented
225
 
        return self.__dict__ == other.__dict__
226
 
 
227
 
    def __ne__(self, other):
228
 
        return not self == other
 
158
        base = self._medium.base
 
159
        if base.startswith('bzr+'):
 
160
            base = base[4:]
 
161
        if (base.startswith('http://') or base.startswith('https://')):
 
162
            # XXX: There seems to be a bug here: http+urllib:// and
 
163
            # http+pycurl:// ought to be treated the same as http://, I think.
 
164
            #   - Andrew Bennetts, 2008-05-19.
 
165
            medium_base = base
 
166
        else:
 
167
            medium_base = urlutils.join(base, '/')
 
168
 
 
169
        transport_base = transport.base
 
170
        if transport_base.startswith('bzr+'):
 
171
            transport_base = transport_base[4:]
 
172
            
 
173
        rel_url = urlutils.relative_url(medium_base, transport_base)
 
174
        return urllib.unquote(rel_url)
 
175