Kaydet (Commit) 88ff6567 authored tarafından Jannis Leidel's avatar Jannis Leidel

Fixed #12955 -- Use the size attribute of the file instead of len() to support…

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
üst 6261593b
...@@ -73,7 +73,7 @@ class FieldFile(File): ...@@ -73,7 +73,7 @@ class FieldFile(File):
def _get_size(self): def _get_size(self):
self._require_file() self._require_file()
if not self._committed: if not self._committed:
return len(self.file) return self.file.size
return self.storage.size(self.name) return self.storage.size(self.name)
size = property(_get_size) size = property(_get_size)
...@@ -93,7 +93,7 @@ class FieldFile(File): ...@@ -93,7 +93,7 @@ class FieldFile(File):
setattr(self.instance, self.field.name, self.name) setattr(self.instance, self.field.name, self.name)
# Update the filesize cache # Update the filesize cache
self._size = len(content) self._size = content.size
self._committed = True self._committed = True
# Save the object because it has changed, unless save is False # Save the object because it has changed, unless save is False
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment