summaryrefslogtreecommitdiff
path: root/django/http/multipartparser.py
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-05-17 16:33:36 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-05-17 18:08:58 +0200
commit9c487b5974ee7e7f196079611d7352364e8873ed (patch)
treeefc6ffa38da07b4302e145c33047cf2c41da105a /django/http/multipartparser.py
parentb1bfd9630ef049070b0cd6ae215470d3d1facd40 (diff)
Replaced an antiquated pattern.
Thanks Lennart Regebro for pointing it out.
Diffstat (limited to 'django/http/multipartparser.py')
-rw-r--r--django/http/multipartparser.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/http/multipartparser.py b/django/http/multipartparser.py
index 0c07335f27..0e999f2ded 100644
--- a/django/http/multipartparser.py
+++ b/django/http/multipartparser.py
@@ -292,7 +292,7 @@ class LazyStream(six.Iterator):
def read(self, size=None):
def parts():
- remaining = (size is not None and [size] or [self._remaining])[0]
+ remaining = self._remaining if size is None else size
# do the whole thing in one shot if no limit was provided.
if remaining is None:
yield b''.join(self)