80
65
root_client_path. unused_bytes are any bytes that were not part of a
81
66
protocol version marker.
83
if bytes.startswith(protocol.MESSAGE_VERSION_THREE):
84
protocol_factory = protocol.build_server_protocol_three
85
bytes = bytes[len(protocol.MESSAGE_VERSION_THREE):]
86
elif bytes.startswith(protocol.REQUEST_VERSION_TWO):
87
protocol_factory = protocol.SmartServerRequestProtocolTwo
88
bytes = bytes[len(protocol.REQUEST_VERSION_TWO):]
68
if bytes.startswith(MESSAGE_VERSION_THREE):
69
protocol_factory = build_server_protocol_three
70
bytes = bytes[len(MESSAGE_VERSION_THREE):]
71
elif bytes.startswith(REQUEST_VERSION_TWO):
72
protocol_factory = SmartServerRequestProtocolTwo
73
bytes = bytes[len(REQUEST_VERSION_TWO):]
90
protocol_factory = protocol.SmartServerRequestProtocolOne
75
protocol_factory = SmartServerRequestProtocolOne
91
76
return protocol_factory, bytes
94
def _get_line(read_bytes_func):
95
"""Read bytes using read_bytes_func until a newline byte.
97
This isn't particularly efficient, so should only be used when the
98
expected size of the line is quite short.
100
:returns: a tuple of two strs: (line, excess)
104
while newline_pos == -1:
105
new_bytes = read_bytes_func(1)
108
# Ran out of bytes before receiving a complete line.
110
newline_pos = bytes.find('\n')
111
line = bytes[:newline_pos+1]
112
excess = bytes[newline_pos+1:]
116
class SmartMedium(object):
117
"""Base class for smart protocol media, both client- and server-side."""
120
self._push_back_buffer = None
122
def _push_back(self, bytes):
123
"""Return unused bytes to the medium, because they belong to the next
126
This sets the _push_back_buffer to the given bytes.
128
if self._push_back_buffer is not None:
129
raise AssertionError(
130
"_push_back called when self._push_back_buffer is %r"
131
% (self._push_back_buffer,))
134
self._push_back_buffer = bytes
136
def _get_push_back_buffer(self):
137
if self._push_back_buffer == '':
138
raise AssertionError(
139
'%s._push_back_buffer should never be the empty string, '
140
'which can be confused with EOF' % (self,))
141
bytes = self._push_back_buffer
142
self._push_back_buffer = None
145
def read_bytes(self, desired_count):
146
"""Read some bytes from this medium.
148
:returns: some bytes, possibly more or less than the number requested
149
in 'desired_count' depending on the medium.
151
if self._push_back_buffer is not None:
152
return self._get_push_back_buffer()
153
bytes_to_read = min(desired_count, _MAX_READ_SIZE)
154
return self._read_bytes(bytes_to_read)
156
def _read_bytes(self, count):
157
raise NotImplementedError(self._read_bytes)
160
"""Read bytes from this request's response until a newline byte.
162
This isn't particularly efficient, so should only be used when the
163
expected size of the line is quite short.
165
:returns: a string of bytes ending in a newline (byte 0x0A).
167
line, excess = _get_line(self.read_bytes)
168
self._push_back(excess)
171
def _report_activity(self, bytes, direction):
172
"""Notify that this medium has activity.
174
Implementations should call this from all methods that actually do IO.
175
Be careful that it's not called twice, if one method is implemented on
178
:param bytes: Number of bytes read or written.
179
:param direction: 'read' or 'write' or None.
181
ui.ui_factory.report_transport_activity(self, bytes, direction)
184
_bad_file_descriptor = (errno.EBADF,)
185
if sys.platform == 'win32':
186
# Given on Windows if you pass a closed socket to select.select. Probably
187
# also given if you pass a file handle to select.
189
_bad_file_descriptor += (WSAENOTSOCK,)
192
class SmartServerStreamMedium(SmartMedium):
79
class SmartServerStreamMedium(object):
193
80
"""Handles smart commands coming over a stream.
195
82
The stream may be a pipe connected to sshd, or a tcp socket, or an
233
137
while not self.finished:
234
138
server_protocol = self._build_protocol()
235
139
self._serve_one_request(server_protocol)
236
except errors.ConnectionTimeout, e:
237
trace.note('%s' % (e,))
238
trace.log_exception_quietly()
239
self._disconnect_client()
240
# We reported it, no reason to make a big fuss.
242
140
except Exception, e:
243
141
stderr.write("%s terminating on exception %s\n" % (self, e))
245
self._disconnect_client()
247
def _stop_gracefully(self):
248
"""When we finish this message, stop looking for more."""
249
trace.mutter('Stopping %s' % (self,))
252
def _disconnect_client(self):
253
"""Close the current connection. We stopped due to a timeout/etc."""
254
# The default implementation is a no-op, because that is all we used to
255
# do when disconnecting from a client. I suppose we never had the
256
# *server* initiate a disconnect, before
258
def _wait_for_bytes_with_timeout(self, timeout_seconds):
259
"""Wait for more bytes to be read, but timeout if none available.
261
This allows us to detect idle connections, and stop trying to read from
262
them, without setting the socket itself to non-blocking. This also
263
allows us to specify when we watch for idle timeouts.
265
:return: Did we timeout? (True if we timed out, False if there is data
268
raise NotImplementedError(self._wait_for_bytes_with_timeout)
270
144
def _build_protocol(self):
271
145
"""Identifies the version of the incoming request, and returns an
336
173
"""Called when an unhandled exception from the protocol occurs."""
337
174
raise NotImplementedError(self.terminate_due_to_error)
339
def _read_bytes(self, desired_count):
176
def _get_bytes(self, desired_count):
340
177
"""Get some bytes from the medium.
342
179
:param desired_count: number of bytes we want to read.
344
raise NotImplementedError(self._read_bytes)
181
raise NotImplementedError(self._get_bytes)
184
"""Read bytes from this request's response until a newline byte.
186
This isn't particularly efficient, so should only be used when the
187
expected size of the line is quite short.
189
:returns: a string of bytes ending in a newline (byte 0x0A).
193
while newline_pos == -1:
194
new_bytes = self._get_bytes(1)
197
# Ran out of bytes before receiving a complete line.
199
newline_pos = bytes.find('\n')
200
line = bytes[:newline_pos+1]
201
self._push_back(bytes[newline_pos+1:])
347
205
class SmartServerSocketStreamMedium(SmartServerStreamMedium):
349
def __init__(self, sock, backing_transport, root_client_path='/',
207
def __init__(self, sock, backing_transport, root_client_path='/'):
353
210
:param sock: the socket the server will read from. It will be put
354
211
into blocking mode.
356
213
SmartServerStreamMedium.__init__(
357
self, backing_transport, root_client_path=root_client_path,
214
self, backing_transport, root_client_path=root_client_path)
359
215
sock.setblocking(True)
360
216
self.socket = sock
361
# Get the getpeername now, as we might be closed later when we care.
363
self._client_info = sock.getpeername()
365
self._client_info = '<unknown>'
368
return '%s(client=%s)' % (self.__class__.__name__, self._client_info)
371
return '%s.%s(client=%s)' % (self.__module__, self.__class__.__name__,
374
218
def _serve_one_request_unguarded(self, protocol):
375
219
while protocol.next_read_size():
376
# We can safely try to read large chunks. If there is less data
377
# than MAX_SOCKET_CHUNK ready, the socket will just return a
378
# short read immediately rather than block.
379
bytes = self.read_bytes(osutils.MAX_SOCKET_CHUNK)
220
bytes = self._get_bytes(4096)
381
222
self.finished = True
383
224
protocol.accept_bytes(bytes)
385
226
self._push_back(protocol.unused_data)
387
def _disconnect_client(self):
388
"""Close the current connection. We stopped due to a timeout/etc."""
391
def _wait_for_bytes_with_timeout(self, timeout_seconds):
392
"""Wait for more bytes to be read, but timeout if none available.
394
This allows us to detect idle connections, and stop trying to read from
395
them, without setting the socket itself to non-blocking. This also
396
allows us to specify when we watch for idle timeouts.
398
:return: None, this will raise ConnectionTimeout if we time out before
401
return self._wait_on_descriptor(self.socket, timeout_seconds)
403
def _read_bytes(self, desired_count):
404
return osutils.read_bytes_from_socket(
405
self.socket, self._report_activity)
228
def _get_bytes(self, desired_count):
229
if self._push_back_buffer is not None:
230
return self._get_push_back_buffer()
231
# We ignore the desired_count because on sockets it's more efficient to
233
return self.socket.recv(4096)
407
235
def terminate_due_to_error(self):
408
236
# TODO: This should log to a server log file, but no such thing
409
237
# exists yet. Andrew Bennetts 2006-09-29.
611
399
return self._read_bytes(count)
613
401
def _read_bytes(self, count):
614
"""Helper for SmartClientMediumRequest.read_bytes.
402
"""Helper for read_bytes.
616
404
read_bytes checks the state of the request to determing if bytes
617
405
should be read. After that it hands off to _read_bytes to do the
620
By default this forwards to self._medium.read_bytes because we are
621
operating on the medium's stream.
623
return self._medium.read_bytes(count)
408
raise NotImplementedError(self._read_bytes)
625
410
def read_line(self):
626
line = self._read_line()
627
if not line.endswith('\n'):
628
# end of file encountered reading from server
629
raise errors.ConnectionReset(
630
"Unexpected end of message. Please check connectivity "
631
"and permissions, and report a bug if problems persist.")
411
"""Read bytes from this request's response until a newline byte.
413
This isn't particularly efficient, so should only be used when the
414
expected size of the line is quite short.
416
:returns: a string of bytes ending in a newline (byte 0x0A).
418
# XXX: this duplicates SmartClientRequestProtocolOne._recv_tuple
420
while not line or line[-1] != '\n':
421
new_char = self.read_bytes(1)
424
# end of file encountered reading from server
425
raise errors.ConnectionReset(
426
"please check connectivity and permissions",
427
"(and try -Dhpss if further diagnosis is required)")
634
def _read_line(self):
635
"""Helper for SmartClientMediumRequest.read_line.
637
By default this forwards to self._medium._get_line because we are
638
operating on the medium's stream.
640
return self._medium._get_line()
643
class _VfsRefuser(object):
644
"""An object that refuses all VFS requests.
649
client._SmartClient.hooks.install_named_hook(
650
'call', self.check_vfs, 'vfs refuser')
652
def check_vfs(self, params):
654
request_method = request.request_handlers.get(params.method)
656
# A method we don't know about doesn't count as a VFS method.
658
if issubclass(request_method, vfs.VfsRequest):
659
raise errors.HpssVfsRequestNotAllowed(params.method, params.args)
662
class _DebugCounter(object):
663
"""An object that counts the HPSS calls made to each client medium.
665
When a medium is garbage-collected, or failing that when
666
bzrlib.global_state exits, the total number of calls made on that medium
667
are reported via trace.note.
671
self.counts = weakref.WeakKeyDictionary()
672
client._SmartClient.hooks.install_named_hook(
673
'call', self.increment_call_count, 'hpss call counter')
674
bzrlib.global_state.cleanups.add_cleanup(self.flush_all)
676
def track(self, medium):
677
"""Start tracking calls made to a medium.
679
This only keeps a weakref to the medium, so shouldn't affect the
682
medium_repr = repr(medium)
683
# Add this medium to the WeakKeyDictionary
684
self.counts[medium] = dict(count=0, vfs_count=0,
685
medium_repr=medium_repr)
686
# Weakref callbacks are fired in reverse order of their association
687
# with the referenced object. So we add a weakref *after* adding to
688
# the WeakKeyDict so that we can report the value from it before the
689
# entry is removed by the WeakKeyDict's own callback.
690
ref = weakref.ref(medium, self.done)
692
def increment_call_count(self, params):
693
# Increment the count in the WeakKeyDictionary
694
value = self.counts[params.medium]
697
request_method = request.request_handlers.get(params.method)
699
# A method we don't know about doesn't count as a VFS method.
701
if issubclass(request_method, vfs.VfsRequest):
702
value['vfs_count'] += 1
705
value = self.counts[ref]
706
count, vfs_count, medium_repr = (
707
value['count'], value['vfs_count'], value['medium_repr'])
708
# In case this callback is invoked for the same ref twice (by the
709
# weakref callback and by the atexit function), set the call count back
710
# to 0 so this item won't be reported twice.
712
value['vfs_count'] = 0
714
trace.note(gettext('HPSS calls: {0} ({1} vfs) {2}').format(
715
count, vfs_count, medium_repr))
718
for ref in list(self.counts.keys()):
721
_debug_counter = None
725
class SmartClientMedium(SmartMedium):
431
class SmartClientMedium(object):
726
432
"""Smart client is a medium for sending smart protocol requests over."""
728
def __init__(self, base):
729
435
super(SmartClientMedium, self).__init__()
731
436
self._protocol_version_error = None
732
437
self._protocol_version = None
733
438
self._done_hello = False
734
# Be optimistic: we assume the remote end can accept new remote
735
# requests until we get an error saying otherwise.
736
# _remote_version_is_before tracks the bzr version the remote side
737
# can be based on what we've seen so far.
738
self._remote_version_is_before = None
739
# Install debug hook function if debug flag is set.
740
if 'hpss' in debug.debug_flags:
741
global _debug_counter
742
if _debug_counter is None:
743
_debug_counter = _DebugCounter()
744
_debug_counter.track(self)
745
if 'hpss_client_no_vfs' in debug.debug_flags:
747
if _vfs_refuser is None:
748
_vfs_refuser = _VfsRefuser()
750
def _is_remote_before(self, version_tuple):
751
"""Is it possible the remote side supports RPCs for a given version?
755
needed_version = (1, 2)
756
if medium._is_remote_before(needed_version):
757
fallback_to_pre_1_2_rpc()
761
except UnknownSmartMethod:
762
medium._remember_remote_is_before(needed_version)
763
fallback_to_pre_1_2_rpc()
765
:seealso: _remember_remote_is_before
767
if self._remote_version_is_before is None:
768
# So far, the remote side seems to support everything
770
return version_tuple >= self._remote_version_is_before
772
def _remember_remote_is_before(self, version_tuple):
773
"""Tell this medium that the remote side is older the given version.
775
:seealso: _is_remote_before
777
if (self._remote_version_is_before is not None and
778
version_tuple > self._remote_version_is_before):
779
# We have been told that the remote side is older than some version
780
# which is newer than a previously supplied older-than version.
781
# This indicates that some smart verb call is not guarded
782
# appropriately (it should simply not have been tried).
784
"_remember_remote_is_before(%r) called, but "
785
"_remember_remote_is_before(%r) was called previously."
786
, version_tuple, self._remote_version_is_before)
787
if 'hpss' in debug.debug_flags:
788
ui.ui_factory.show_warning(
789
"_remember_remote_is_before(%r) called, but "
790
"_remember_remote_is_before(%r) was called previously."
791
% (version_tuple, self._remote_version_is_before))
793
self._remote_version_is_before = version_tuple
795
440
def protocol_version(self):
796
441
"""Find out if 'hello' smart request works."""
884
522
return SmartClientStreamMediumRequest(self)
887
"""We have been disconnected, reset current state.
889
This resets things like _current_request and connected state.
892
self._current_request = None
524
def read_bytes(self, count):
525
return self._read_bytes(count)
895
528
class SmartSimplePipesClientMedium(SmartClientStreamMedium):
896
529
"""A client medium using simple pipes.
898
531
This client does not manage the pipes: it assumes they will always be open.
901
def __init__(self, readable_pipe, writeable_pipe, base):
902
SmartClientStreamMedium.__init__(self, base)
534
def __init__(self, readable_pipe, writeable_pipe):
535
SmartClientStreamMedium.__init__(self)
903
536
self._readable_pipe = readable_pipe
904
537
self._writeable_pipe = writeable_pipe
906
539
def _accept_bytes(self, bytes):
907
540
"""See SmartClientStreamMedium.accept_bytes."""
909
self._writeable_pipe.write(bytes)
911
if e.errno in (errno.EINVAL, errno.EPIPE):
912
raise errors.ConnectionReset(
913
"Error trying to write to subprocess", e)
915
self._report_activity(len(bytes), 'write')
541
self._writeable_pipe.write(bytes)
917
543
def _flush(self):
918
544
"""See SmartClientStreamMedium._flush()."""
919
# Note: If flush were to fail, we'd like to raise ConnectionReset, etc.
920
# However, testing shows that even when the child process is
921
# gone, this doesn't error.
922
545
self._writeable_pipe.flush()
924
547
def _read_bytes(self, count):
925
548
"""See SmartClientStreamMedium._read_bytes."""
926
bytes_to_read = min(count, _MAX_READ_SIZE)
927
bytes = self._readable_pipe.read(bytes_to_read)
928
self._report_activity(len(bytes), 'read')
932
class SSHParams(object):
933
"""A set of parameters for starting a remote bzr via SSH."""
549
return self._readable_pipe.read(count)
552
class SmartSSHClientMedium(SmartClientStreamMedium):
553
"""A client medium using SSH."""
935
555
def __init__(self, host, port=None, username=None, password=None,
936
bzr_remote_path='bzr'):
939
self.username = username
940
self.password = password
941
self.bzr_remote_path = bzr_remote_path
944
class SmartSSHClientMedium(SmartClientStreamMedium):
945
"""A client medium using SSH.
947
It delegates IO to a SmartSimplePipesClientMedium or
948
SmartClientAlreadyConnectedSocketMedium (depending on platform).
951
def __init__(self, base, ssh_params, vendor=None):
556
vendor=None, bzr_remote_path=None):
952
557
"""Creates a client that will connect on the first use.
954
:param ssh_params: A SSHParams instance.
955
559
:param vendor: An optional override for the ssh vendor to use. See
956
560
bzrlib.transport.ssh for details on ssh vendors.
958
self._real_medium = None
959
self._ssh_params = ssh_params
960
# for the benefit of progress making a short description of this
962
self._scheme = 'bzr+ssh'
963
# SmartClientStreamMedium stores the repr of this object in its
964
# _DebugCounter so we have to store all the values used in our repr
965
# method before calling the super init.
966
SmartClientStreamMedium.__init__(self, base)
562
SmartClientStreamMedium.__init__(self)
563
self._connected = False
565
self._password = password
567
self._username = username
568
self._read_from = None
569
self._ssh_connection = None
967
570
self._vendor = vendor
968
self._ssh_connection = None
971
if self._ssh_params.port is None:
974
maybe_port = ':%s' % self._ssh_params.port
975
if self._ssh_params.username is None:
978
maybe_user = '%s@' % self._ssh_params.username
979
return "%s(%s://%s%s%s/)" % (
980
self.__class__.__name__,
983
self._ssh_params.host,
571
self._write_to = None
572
self._bzr_remote_path = bzr_remote_path
573
if self._bzr_remote_path is None:
574
symbol_versioning.warn(
575
'bzr_remote_path is required as of bzr 0.92',
576
DeprecationWarning, stacklevel=2)
577
self._bzr_remote_path = os.environ.get('BZR_REMOTE_PATH', 'bzr')
986
579
def _accept_bytes(self, bytes):
987
580
"""See SmartClientStreamMedium.accept_bytes."""
988
581
self._ensure_connection()
989
self._real_medium.accept_bytes(bytes)
582
self._write_to.write(bytes)
991
584
def disconnect(self):
992
585
"""See SmartClientMedium.disconnect()."""
993
if self._real_medium is not None:
994
self._real_medium.disconnect()
995
self._real_medium = None
996
if self._ssh_connection is not None:
997
self._ssh_connection.close()
998
self._ssh_connection = None
586
if not self._connected:
588
self._read_from.close()
589
self._write_to.close()
590
self._ssh_connection.close()
591
self._connected = False
1000
593
def _ensure_connection(self):
1001
594
"""Connect this medium if not already connected."""
1002
if self._real_medium is not None:
1004
597
if self._vendor is None:
1005
598
vendor = ssh._get_ssh_vendor()
1007
600
vendor = self._vendor
1008
self._ssh_connection = vendor.connect_ssh(self._ssh_params.username,
1009
self._ssh_params.password, self._ssh_params.host,
1010
self._ssh_params.port,
1011
command=[self._ssh_params.bzr_remote_path, 'serve', '--inet',
601
self._ssh_connection = vendor.connect_ssh(self._username,
602
self._password, self._host, self._port,
603
command=[self._bzr_remote_path, 'serve', '--inet',
1012
604
'--directory=/', '--allow-writes'])
1013
io_kind, io_object = self._ssh_connection.get_sock_or_pipes()
1014
if io_kind == 'socket':
1015
self._real_medium = SmartClientAlreadyConnectedSocketMedium(
1016
self.base, io_object)
1017
elif io_kind == 'pipes':
1018
read_from, write_to = io_object
1019
self._real_medium = SmartSimplePipesClientMedium(
1020
read_from, write_to, self.base)
1022
raise AssertionError(
1023
"Unexpected io_kind %r from %r"
1024
% (io_kind, self._ssh_connection))
1025
for hook in transport.Transport.hooks["post_connect"]:
605
self._read_from, self._write_to = \
606
self._ssh_connection.get_filelike_channels()
607
self._connected = True
1028
609
def _flush(self):
1029
610
"""See SmartClientStreamMedium._flush()."""
1030
self._real_medium._flush()
611
self._write_to.flush()
1032
613
def _read_bytes(self, count):
1033
614
"""See SmartClientStreamMedium.read_bytes."""
1034
if self._real_medium is None:
615
if not self._connected:
1035
616
raise errors.MediumNotConnected(self)
1036
return self._real_medium.read_bytes(count)
617
return self._read_from.read(count)
1039
620
# Port 4155 is the default port for bzr://, registered with IANA.
1040
BZR_DEFAULT_INTERFACE = None
621
BZR_DEFAULT_INTERFACE = '0.0.0.0'
1041
622
BZR_DEFAULT_PORT = 4155
1044
class SmartClientSocketMedium(SmartClientStreamMedium):
1045
"""A client medium using a socket.
1047
This class isn't usable directly. Use one of its subclasses instead.
1050
def __init__(self, base):
1051
SmartClientStreamMedium.__init__(self, base)
625
class SmartTCPClientMedium(SmartClientStreamMedium):
626
"""A client medium using TCP."""
628
def __init__(self, host, port):
629
"""Creates a client that will connect on the first use."""
630
SmartClientStreamMedium.__init__(self)
631
self._connected = False
1052
634
self._socket = None
1053
self._connected = False
1055
636
def _accept_bytes(self, bytes):
1056
637
"""See SmartClientMedium.accept_bytes."""
1057
638
self._ensure_connection()
1058
osutils.send_all(self._socket, bytes, self._report_activity)
1060
def _ensure_connection(self):
1061
"""Connect this medium if not already connected."""
1062
raise NotImplementedError(self._ensure_connection)
1065
"""See SmartClientStreamMedium._flush().
1067
For sockets we do no flushing. For TCP sockets we may want to turn off
1068
TCP_NODELAY and add a means to do a flush, but that can be done in the
1072
def _read_bytes(self, count):
1073
"""See SmartClientMedium.read_bytes."""
1074
if not self._connected:
1075
raise errors.MediumNotConnected(self)
1076
return osutils.read_bytes_from_socket(
1077
self._socket, self._report_activity)
639
osutils.send_all(self._socket, bytes)
1079
641
def disconnect(self):
1080
642
"""See SmartClientMedium.disconnect()."""
1084
646
self._socket = None
1085
647
self._connected = False
1088
class SmartTCPClientMedium(SmartClientSocketMedium):
1089
"""A client medium that creates a TCP connection."""
1091
def __init__(self, host, port, base):
1092
"""Creates a client that will connect on the first use."""
1093
SmartClientSocketMedium.__init__(self, base)
1097
649
def _ensure_connection(self):
1098
650
"""Connect this medium if not already connected."""
1099
651
if self._connected:
653
self._socket = socket.socket()
654
self._socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
1101
655
if self._port is None:
1102
656
port = BZR_DEFAULT_PORT
1104
658
port = int(self._port)
1106
sockaddrs = socket.getaddrinfo(self._host, port, socket.AF_UNSPEC,
1107
socket.SOCK_STREAM, 0, 0)
1108
except socket.gaierror, (err_num, err_msg):
1109
raise errors.ConnectionError("failed to lookup %s:%d: %s" %
1110
(self._host, port, err_msg))
1111
# Initialize err in case there are no addresses returned:
1112
err = socket.error("no address found for %s" % self._host)
1113
for (family, socktype, proto, canonname, sockaddr) in sockaddrs:
1115
self._socket = socket.socket(family, socktype, proto)
1116
self._socket.setsockopt(socket.IPPROTO_TCP,
1117
socket.TCP_NODELAY, 1)
1118
self._socket.connect(sockaddr)
1119
except socket.error, err:
1120
if self._socket is not None:
1121
self._socket.close()
1125
if self._socket is None:
660
self._socket.connect((self._host, port))
661
except socket.error, err:
1126
662
# socket errors either have a (string) or (errno, string) as their
1128
664
if type(err.args) is str:
added
removed
bzrlib/smart/medium.py
