/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 breezy/iterablefile.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 12:50:32 UTC
  • mfrom: (6679 work)
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170610125032-xb5rd5fjskjallos
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/iterablefile.py
23
23
    def __init__(self, iterable):
24
24
        object.__init__(self)
25
25
        self._iter = iterable.__iter__()
26
 
        self._buffer = ""
 
26
        self._buffer = b""
27
27
        self.done = False
28
28
 
29
29
    def read_n(self, length):
70
70
                result += next(self._iter)
71
71
            except StopIteration:
72
72
                self.done = True
73
 
                self._buffer = ""
 
73
                self._buffer = b""
74
74
                return result
75
75
        output_length = result_length(result)
76
76
        self._buffer = result[output_length:]
110
110
    def _make_iterator(self):
111
111
        while not self._file_base.done:
112
112
            self._check_closed()
113
 
            result = self._file_base.read_to('\n')
114
 
            if result != '':
 
113
            result = self._file_base.read_to(b'\n')
 
114
            if result != b'':
115
115
                yield result
116
116
 
117
117
    def _check_closed(self):
227
227
        Traceback (most recent call last):
228
228
        ValueError: File is closed.
229
229
        """
230
 
        return self.read_to('\n', size)
 
230
        return self.read_to(b'\n', size)
231
231
 
232
232
    def readlines(self, sizehint=None):
233
233
        """
243
243
        lines = []
244
244
        while True:
245
245
            line = self.readline()
246
 
            if line == "":
 
246
            if line == b"":
247
247
                return lines
248
248
            if sizehint is None:
249
249
                lines.append(line)