diff options
| author | Jacob Kaplan-Moss <jacob@jacobian.org> | 2009-05-13 18:45:16 +0000 |
|---|---|---|
| committer | Jacob Kaplan-Moss <jacob@jacobian.org> | 2009-05-13 18:45:16 +0000 |
| commit | f4fce99bc1247f333c4093f3cfa077f7acd8d541 (patch) | |
| tree | 989391ffabf7c393a5c94baad9835f91ad2d0289 /django | |
| parent | 11d08bca2bf99de7e7aefec7986a206ea5039724 (diff) | |
[1.0.X] Fixed #10687: fixed request parsing when upload_handlers is empty. Thanks, Armin Ronacher. Backport of [10723] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10765 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/core/files/base.py | 2 | ||||
| -rw-r--r-- | django/http/multipartparser.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/django/core/files/base.py b/django/core/files/base.py index 69739d6488..596fbd745a 100644 --- a/django/core/files/base.py +++ b/django/core/files/base.py @@ -1,7 +1,5 @@ import os - from django.utils.encoding import smart_str, smart_unicode - try: from cStringIO import StringIO except ImportError: diff --git a/django/http/multipartparser.py b/django/http/multipartparser.py index 048c9aaea2..e45d5d1035 100644 --- a/django/http/multipartparser.py +++ b/django/http/multipartparser.py @@ -84,7 +84,8 @@ class MultiPartParser(object): # For compatibility with low-level network APIs (with 32-bit integers), # the chunk size should be < 2^31, but still divisible by 4. - self._chunk_size = min(2**31-4, *[x.chunk_size for x in upload_handlers if x.chunk_size]) + possible_sizes = [x.chunk_size for x in upload_handlers if x.chunk_size] + self._chunk_size = min([2**31-4] + possible_sizes) self._meta = META self._encoding = encoding or settings.DEFAULT_CHARSET |