mirror of https://github.com/django/django.git
Fixed #16243 -- Corrected test suite failure in model_forms when PIL isn't installed
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16391 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
13efd10465
commit
c013c07ed7
|
@ -14,11 +14,19 @@ from django.utils.unittest import skipUnless
|
|||
from modeltests.model_forms.models import (Article, ArticleStatus,
|
||||
BetterWriter, BigInt, Book, Category, CommaSeparatedInteger,
|
||||
CustomFieldForExclusionModel, DerivedBook, DerivedPost, ExplicitPK,
|
||||
FlexibleDatePost, ImageFile, ImprovedArticle,
|
||||
ImprovedArticleWithParentLink, Inventory, OptionalImageFile, PhoneNumber,
|
||||
Post, Price, Product, TextFile, Writer, WriterProfile,
|
||||
test_images)
|
||||
FlexibleDatePost, ImprovedArticle, ImprovedArticleWithParentLink,
|
||||
Inventory, PhoneNumber, Post, Price, Product, TextFile, Writer,
|
||||
WriterProfile, test_images)
|
||||
|
||||
if test_images:
|
||||
from modeltests.model_forms.models import ImageFile, OptionalImageFile
|
||||
class ImageFileForm(forms.ModelForm):
|
||||
class Meta:
|
||||
model = ImageFile
|
||||
|
||||
class OptionalImageFileForm(forms.ModelForm):
|
||||
class Meta:
|
||||
model = OptionalImageFile
|
||||
|
||||
class ProductForm(forms.ModelForm):
|
||||
class Meta:
|
||||
|
@ -149,14 +157,6 @@ class BigIntForm(forms.ModelForm):
|
|||
class Meta:
|
||||
model = BigInt
|
||||
|
||||
class ImageFileForm(forms.ModelForm):
|
||||
class Meta:
|
||||
model = ImageFile
|
||||
|
||||
class OptionalImageFileForm(forms.ModelForm):
|
||||
class Meta:
|
||||
model = OptionalImageFile
|
||||
|
||||
class ModelFormWithMedia(forms.ModelForm):
|
||||
class Media:
|
||||
js = ('/some/form/javascript',)
|
||||
|
|
Loading…
Reference in New Issue