summaryrefslogtreecommitdiff
path: root/django/http/multipartparser.py
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-06-16 11:46:32 -0400
committerTim Graham <timograham@gmail.com>2015-06-17 06:55:16 -0400
commit3f2de803181ca3c5526ec9d708b2098b8f683808 (patch)
tree5a8ea1bffc538de77180d1f288271ab28448a4b5 /django/http/multipartparser.py
parentcf6ce279c7671a4c83c960c5c526f92679a4fac8 (diff)
Refs #23763 -- Fixed Python 3.5 PendingDeprecationWarning in LazyStream.
Fixed "PendingDeprecationWarning: generator 'LazyStream.read.<locals>.parts' raised StopIteration" per PEP 0479.
Diffstat (limited to 'django/http/multipartparser.py')
-rw-r--r--django/http/multipartparser.py15
1 files changed, 9 insertions, 6 deletions
diff --git a/django/http/multipartparser.py b/django/http/multipartparser.py
index 53e4149519..375584e4f3 100644
--- a/django/http/multipartparser.py
+++ b/django/http/multipartparser.py
@@ -327,12 +327,15 @@ class LazyStream(six.Iterator):
while remaining != 0:
assert remaining > 0, 'remaining bytes to read should never go negative'
- chunk = next(self)
-
- emitting = chunk[:remaining]
- self.unget(chunk[remaining:])
- remaining -= len(emitting)
- yield emitting
+ try:
+ chunk = next(self)
+ except StopIteration:
+ return
+ else:
+ emitting = chunk[:remaining]
+ self.unget(chunk[remaining:])
+ remaining -= len(emitting)
+ yield emitting
out = b''.join(parts())
return out