← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/protocol.py

  • Committer: Andrew Bennetts
  • Date: 2008-05-16 07:05:26 UTC
  • mto: This revision was merged to the branch mainline in revision 3428.
  • Revision ID: andrew.bennetts@canonical.com-20080516070526-iviihh7mmuwlr5z0
Various tweaks in response to Martin's review.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/protocol.py
120
120
        self.unused_data = ''
121
121
        self._finished = False
122
122
        self.in_buffer = ''
123
 
        self.has_dispatched = False
 
123
        self._has_dispatched = False
124
124
        self.request = None
125
125
        self._body_decoder = None
126
126
        self._write_func = write_func
133
133
        if not isinstance(bytes, str):
134
134
            raise ValueError(bytes)
135
135
        self.in_buffer += bytes
136
 
        if not self.has_dispatched:
 
136
        if not self._has_dispatched:
137
137
            if '\n' not in self.in_buffer:
138
138
                # no command line yet
139
139
                return
140
 
            self.has_dispatched = True
 
140
            self._has_dispatched = True
141
141
            try:
142
142
                first_line, self.in_buffer = self.in_buffer.split('\n', 1)
143
143
                first_line += '\n'
167
167
                    ('error', str(exception))))
168
168
                return
169
169
 
170
 
        if self.has_dispatched:
 
170
        if self._has_dispatched:
171
171
            if self._finished:
172
172
                # nothing to do.XXX: this routine should be a single state 
173
173
                # machine too.
739
739
            return 1
740
740
        elif resp == ('ok', '2'):
741
741
            return 2
742
 
        elif resp == ('ok', '3'):
743
 
            return 3
744
742
        else:
745
743
            raise errors.SmartProtocolError("bad response %r" % (resp,))
746
744
 
833
831
 
834
832
    def __init__(self, message_handler, expect_version_marker=False):
835
833
        _StatefulDecoder.__init__(self)
836
 
        self.has_dispatched = False
 
834
        self._has_dispatched = False
837
835
        # Initial state
838
836
        if expect_version_marker:
839
837
            self.state_accept = self._state_accept_expecting_protocol_version