mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-05-10 08:56:29 +00:00
Code Issues 32 Releases Wiki Activity

Used cached_property for File.size.

Browse Source
This commit is contained in:
Sergey Fedoseev 2018-03-10 17:21:39 +05:00
parent 5b083a824e
commit a5406fe989
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
django/core/files/base.py
View File

@ -2,6 +2,7 @@ import os
from io import BytesIO, StringIO, UnsupportedOperation from io import BytesIO, StringIO, UnsupportedOperation
from django.core.files.utils import FileProxyMixin from django.core.files.utils import FileProxyMixin
from django.utils.functional import cached_property
class File(FileProxyMixin): class File(FileProxyMixin):
@ -27,7 +28,8 @@ class File(FileProxyMixin):
def __len__(self): def __len__(self):
return self.size return self.size
def _get_size_from_underlying_file(self): @cached_property
def size(self):
if hasattr(self.file, 'size'): if hasattr(self.file, 'size'):
return self.file.size return self.file.size
if hasattr(self.file, 'name'): if hasattr(self.file, 'name'):
@ -43,17 +45,6 @@ class File(FileProxyMixin):
return size return size
raise AttributeError("Unable to determine the file's size.") raise AttributeError("Unable to determine the file's size.")
def _get_size(self):
if hasattr(self, '_size'):
return self._size
self._size = self._get_size_from_underlying_file()
return self._size
def _set_size(self, size):
self._size = size
size = property(_get_size, _set_size)
def chunks(self, chunk_size=None): def chunks(self, chunk_size=None):
""" """
Read the file and yield chunks of ``chunk_size`` bytes (defaults to Read the file and yield chunks of ``chunk_size`` bytes (defaults to
@ -150,7 +141,7 @@ class ContentFile(File):
pass pass
def write(self, data): def write(self, data):
self.__dict__.pop('_size', None) # Clear the computed size. self.__dict__.pop('size', None) # Clear the computed size.
return self.file.write(data) return self.file.write(data)