/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/message.py

  • Committer: Vincent Ladeuil
  • Date: 2008-10-01 06:54:56 UTC
  • mto: This revision was merged to the branch mainline in revision 3760.
  • Revision ID: v.ladeuil+lp@free.fr-20081001065456-11t2baisy3yyf6po
Fixed as per Andrew's review.

* bzrlib/smart/message.py:
(ConventionalResponseHandler._read_more): Revert previous change,
wrong layer.

* bzrlib/smart/medium.py:
(SmartTCPClientMedium._read_bytes): Catch socket connection reset.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/message.py
16
16
 
17
17
import collections
18
18
from cStringIO import StringIO
19
 
import errno
20
 
import socket
21
19
 
22
20
from bzrlib import (
23
21
    debug,
236
234
            self.finished_reading = True
237
235
            self._medium_request.finished_reading()
238
236
            return
239
 
        try:
240
 
            bytes = self._medium_request.read_bytes(next_read_size)
241
 
        except socket.error, e:
242
 
            if len(e.args) and e.args[0] is errno.ECONNRESET:
243
 
                bytes = ''
244
 
            else:
245
 
                raise
 
237
        bytes = self._medium_request.read_bytes(next_read_size)
246
238
        if bytes == '':
247
239
            # end of file encountered reading from server
248
240
            if 'hpss' in debug.debug_flags: