mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-19 03:05:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

A large number of stylistic cleanups across django/db/

Browse source
This commit is contained in:
Alex Gaynor 2013-07-08 10:39:54 +10:00
parent 0b69a75502
commit 03d9566e0d
48 changed files with 383 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

7
django/db/models/fields/files.py
View file

@ -11,6 +11,7 @@ from django.utils.encoding import force_str, force_text
from django.utils import six
from django.utils.translation import ugettext_lazy as _
class FieldFile(File):
def __init__(self, instance, field, name):
super(FieldFile, self).__init__(None, name)
@ -135,6 +136,7 @@ class FieldFile(File):
# be restored later, by FileDescriptor below.
return {'name': self.name, 'closed': False, '_committed': True, '_file': None}
class FileDescriptor(object):
"""
The descriptor for the file attribute on the model instance. Returns a
@ -205,6 +207,7 @@ class FileDescriptor(object):
def __set__(self, instance, value):
instance.__dict__[self.field.name] = value
class FileField(Field):
# The class to wrap instance attributes in. Accessing the file object off
@ -300,6 +303,7 @@ class FileField(Field):
defaults.update(kwargs)
return super(FileField, self).formfield(**defaults)
class ImageFileDescriptor(FileDescriptor):
"""
Just like the FileDescriptor, but for ImageFields. The only difference is
@ -321,14 +325,15 @@ class ImageFileDescriptor(FileDescriptor):
if previous_file is not None:
self.field.update_dimension_fields(instance, force=True)
class ImageFieldFile(ImageFile, FieldFile):
class ImageFieldFile(ImageFile, FieldFile):
def delete(self, save=True):
# Clear the image dimensions cache
if hasattr(self, '_dimensions_cache'):
del self._dimensions_cache
super(ImageFieldFile, self).delete(save)
class ImageField(FileField):
attr_class = ImageFieldFile
descriptor_class = ImageFileDescriptor