equal
deleted
inserted
replaced
71 # so the pipe doesn't fill up risking a deadlock |
71 # so the pipe doesn't fill up risking a deadlock |
72 size = self.maxchunksize |
72 size = self.maxchunksize |
73 s = self._read(size, self.channel) |
73 s = self._read(size, self.channel) |
74 buf = s |
74 buf = s |
75 while s: |
75 while s: |
|
76 s = self._read(size, self.channel) |
76 buf += s |
77 buf += s |
77 s = self._read(size, self.channel) |
|
78 |
78 |
79 return buf |
79 return buf |
80 else: |
80 else: |
81 return self._read(size, self.channel) |
81 return self._read(size, self.channel) |
82 |
82 |
102 s = self._read(size, 'L') |
102 s = self._read(size, 'L') |
103 buf = s |
103 buf = s |
104 # keep asking for more until there's either no more or |
104 # keep asking for more until there's either no more or |
105 # we got a full line |
105 # we got a full line |
106 while s and s[-1] != '\n': |
106 while s and s[-1] != '\n': |
|
107 s = self._read(size, 'L') |
107 buf += s |
108 buf += s |
108 s = self._read(size, 'L') |
|
109 |
109 |
110 return buf |
110 return buf |
111 else: |
111 else: |
112 return self._read(size, 'L') |
112 return self._read(size, 'L') |
113 |
113 |