[1.8.x] Refs #23763 -- Fixed Python 3.5 PendingDeprecationWarning in LazyStream.
Fixed "PendingDeprecationWarning: generator 'LazyStream.read.<locals>.parts' raised StopIteration" per PEP 0479. Backport of 3f2de803181ca3c5526ec9d708b2098b8f683808 from master
This commit is contained in:
parent
e2ea30c440
commit
2a36a9bb15
@ -327,12 +327,15 @@ class LazyStream(six.Iterator):
|
|||||||
while remaining != 0:
|
while remaining != 0:
|
||||||
assert remaining > 0, 'remaining bytes to read should never go negative'
|
assert remaining > 0, 'remaining bytes to read should never go negative'
|
||||||
|
|
||||||
chunk = next(self)
|
try:
|
||||||
|
chunk = next(self)
|
||||||
emitting = chunk[:remaining]
|
except StopIteration:
|
||||||
self.unget(chunk[remaining:])
|
return
|
||||||
remaining -= len(emitting)
|
else:
|
||||||
yield emitting
|
emitting = chunk[:remaining]
|
||||||
|
self.unget(chunk[remaining:])
|
||||||
|
remaining -= len(emitting)
|
||||||
|
yield emitting
|
||||||
|
|
||||||
out = b''.join(parts())
|
out = b''.join(parts())
|
||||||
return out
|
return out
|
||||||
|
Loading…
x
Reference in New Issue
Block a user