diff options
author | Vytis Banaitis <vytis.banaitis@gmail.com> | 2017-02-13 15:58:10 +0200 |
---|---|---|
committer | Tim Graham <timograham@gmail.com> | 2017-02-13 08:58:10 -0500 |
commit | 3effe3a9c63cd461a1ea7c42bab0e8fbc34b0c53 (patch) | |
tree | 1eec51e9b44845bc2530ebfc3adfaacc1266dd66 /tests/bulk_create | |
parent | 3f5a35d6e2dfc0c981dbd8945a8c7cd35c32e5c8 (diff) | |
download | django-3effe3a9c63cd461a1ea7c42bab0e8fbc34b0c53.tar.gz |
Refs #22669 -- Fixed bulk_create test if Pillow isn't installed.
Diffstat (limited to 'tests/bulk_create')
-rw-r--r-- | tests/bulk_create/models.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/bulk_create/models.py b/tests/bulk_create/models.py index 75d4a3cbdc..b98ce4a152 100644 --- a/tests/bulk_create/models.py +++ b/tests/bulk_create/models.py @@ -5,6 +5,11 @@ from decimal import Decimal from django.db import models from django.utils import timezone +try: + from PIL import Image +except ImportError: + Image = None + class Country(models.Model): name = models.CharField(max_length=255) @@ -76,11 +81,11 @@ class NullableFields(models.Model): # Fields not required in BulkInsertMapper char_field = models.CharField(null=True, max_length=4, default='char') email_field = models.EmailField(null=True, default='user@example.com') - duration_field = models.DurationField(null=True, default=datetime.timedelta(1)) file_field = models.FileField(null=True, default='file.txt') file_path_field = models.FilePathField(path='/tmp', null=True, default='file.txt') generic_ip_address_field = models.GenericIPAddressField(null=True, default='127.0.0.1') - image_field = models.ImageField(null=True, default='image.jpg') + if Image: + image_field = models.ImageField(null=True, default='image.jpg') slug_field = models.SlugField(null=True, default='slug') text_field = models.TextField(null=True, default='text') url_field = models.URLField(null=True, default='/') |