← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/message.py

  • Committer: John Arbash Meinel
  • Date: 2008-09-24 12:53:22 UTC
  • mfrom: (3697.7.3 1.7)
  • mto: (3697.7.4 1.7)
  • mto: This revision was merged to the branch mainline in revision 3748.
  • Revision ID: john@arbash-meinel.com-20080924125322-p1i7pnr0m49v1hze
Bring in the 1.7 branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/message.py
120
120
        self.request_handler.accept_body(bytes)
121
121
        self.request_handler.end_of_body()
122
122
        if not self.request_handler.finished_reading:
123
 
            raise SmartProtocolError(
 
123
            raise errors.SmartProtocolError(
124
124
                "Conventional request body was received, but request handler "
125
125
                "has not finished reading.")
126
126
        self.responder.send_response(self.request_handler.response)
240
240
            if 'hpss' in debug.debug_flags:
241
241
                mutter(
242
242
                    'decoder state: buf[:10]=%r, state_accept=%s',
243
 
                    self._protocol_decoder._in_buffer[:10],
 
243
                    self._protocol_decoder._get_in_buffer()[:10],
244
244
                    self._protocol_decoder.state_accept.__name__)
245
245
            raise errors.ConnectionReset(
246
246
                "please check connectivity and permissions",