From c013c07ed7908b009cfd2ccc511e3e635c66f3d6 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Mon, 13 Jun 2011 13:23:49 +0000 Subject: [PATCH] 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 --- tests/modeltests/model_forms/tests.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/modeltests/model_forms/tests.py b/tests/modeltests/model_forms/tests.py index b67c160052..0831035a55 100644 --- a/tests/modeltests/model_forms/tests.py +++ b/tests/modeltests/model_forms/tests.py @@ -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',)