← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/medium.py

Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/medium.py
358
358
            new_char = self.read_bytes(1)
359
359
            line += new_char
360
360
            if new_char == '':
361
 
                raise errors.SmartProtocolError(
362
 
                    'unexpected end of file reading from server')
 
361
                # end of file encountered reading from server
 
362
                raise errors.ConnectionReset(
 
363
                    "please check connectivity and permissions",
 
364
                    "(and try -Dhpss if further diagnosis is required)")
363
365
        return line
364
366
 
365
367
 
384
386
 
385
387
    def __init__(self):
386
388
        self._current_request = None
 
389
        # Be optimistic: we assume the remote end can accept new remote
 
390
        # requests until we get an error saying otherwise.  (1.2 adds some
 
391
        # requests that send bodies, which confuses older servers.)
 
392
        self._remote_is_at_least_1_2 = True
387
393
 
388
394
    def accept_bytes(self, bytes):
389
395
        self._accept_bytes(bytes)