/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/transport/http/__init__.py

Merge with intertree

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/__init__.py
27
27
import sys
28
28
 
29
29
from bzrlib import (
 
30
    debug,
30
31
    errors,
31
32
    ui,
32
33
    urlutils,
230
231
 
231
232
            # Turn it into a list, we will iterate it several times
232
233
            coalesced = list(coalesced)
233
 
            mutter('http readv of %s  offsets => %s collapsed %s',
 
234
            if 'http' in debug.debug_flags:
 
235
                mutter('http readv of %s  offsets => %s collapsed %s',
234
236
                    relpath, len(offsets), len(coalesced))
235
237
 
236
238
            # Cache the data read, but only until it's been used
555
557
        """See SmartClientMediumRequest._read_bytes."""
556
558
        return self._response_body.read(count)
557
559
 
 
560
    def _read_line(self):
 
561
        line, excess = medium._get_line(self._response_body.read)
 
562
        if excess != '':
 
563
            raise AssertionError(
 
564
                '_get_line returned excess bytes, but this mediumrequest '
 
565
                'cannot handle excess. (%r)' % (excess,))
 
566
        return line
 
567
 
558
568
    def _finished_reading(self):
559
569
        """See SmartClientMediumRequest._finished_reading."""
560
570
        pass