summaryrefslogtreecommitdiff
path: root/django/db/models/fields/files.py
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-12-12 22:54:22 +0000
committerJannis Leidel <jannis@leidel.info>2010-12-12 22:54:22 +0000
commit88ff6567310d809abddb97adebf04d5e9403ca8a (patch)
treed2440fc198e5232b2cee07aa3b53b261fe579040 /django/db/models/fields/files.py
parent6261593b998ed205b3d45833926cf75756384a13 (diff)
downloaddjango-88ff6567310d809abddb97adebf04d5e9403ca8a.tar.gz
Fixed #12955 -- Use the size attribute of the file instead of len() to support uploads larger than 2GB. Thanks, swiedenroth and isagalaev.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14878 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/fields/files.py')
-rw-r--r--django/db/models/fields/files.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/fields/files.py b/django/db/models/fields/files.py
index 9ee523b9d5..a65b7cdb4c 100644
--- a/django/db/models/fields/files.py
+++ b/django/db/models/fields/files.py
@@ -73,7 +73,7 @@ class FieldFile(File):
def _get_size(self):
self._require_file()
if not self._committed:
- return len(self.file)
+ return self.file.size
return self.storage.size(self.name)
size = property(_get_size)
@@ -93,7 +93,7 @@ class FieldFile(File):
setattr(self.instance, self.field.name, self.name)
# Update the filesize cache
- self._size = len(content)
+ self._size = content.size
self._committed = True
# Save the object because it has changed, unless save is False