encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-09 08:00:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Don't barf if PIL is not installed.

Browse Source
This commit is contained in:
Tom Christie 2014-03-07 14:16:14 +00:00
parent 4001cd74ed
commit 3fa95132d8
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
rest_framework/tests/test_serializer.py
View File

@ -3,6 +3,7 @@ from __future__ import unicode_literals
from django.db import models from django.db import models
from django.db.models.fields import BLANK_CHOICE_DASH from django.db.models.fields import BLANK_CHOICE_DASH
from django.test import TestCase from django.test import TestCase
from django.utils import unittest
from django.utils.datastructures import MultiValueDict from django.utils.datastructures import MultiValueDict
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from rest_framework import serializers, fields, relations from rest_framework import serializers, fields, relations
@ -12,26 +13,31 @@ from rest_framework.tests.models import (HasPositiveIntegerAsChoice, Album, Acti
from rest_framework.tests.models import BasicModelSerializer from rest_framework.tests.models import BasicModelSerializer
import datetime import datetime
import pickle import pickle
try:
import PIL
except:
PIL = None
class AMOAFModel(RESTFrameworkModel): if PIL is not None:
char_field = models.CharField(max_length=1024, blank=True) class AMOAFModel(RESTFrameworkModel):
comma_separated_integer_field = models.CommaSeparatedIntegerField(max_length=1024, blank=True) char_field = models.CharField(max_length=1024, blank=True)
decimal_field = models.DecimalField(max_digits=64, decimal_places=32, blank=True) comma_separated_integer_field = models.CommaSeparatedIntegerField(max_length=1024, blank=True)
email_field = models.EmailField(max_length=1024, blank=True) decimal_field = models.DecimalField(max_digits=64, decimal_places=32, blank=True)
file_field = models.FileField(upload_to='test', max_length=1024, blank=True) email_field = models.EmailField(max_length=1024, blank=True)
image_field = models.ImageField(upload_to='test', max_length=1024, blank=True) file_field = models.FileField(upload_to='test', max_length=1024, blank=True)
slug_field = models.SlugField(max_length=1024, blank=True) image_field = models.ImageField(upload_to='test', max_length=1024, blank=True)
url_field = models.URLField(max_length=1024, blank=True) slug_field = models.SlugField(max_length=1024, blank=True)
url_field = models.URLField(max_length=1024, blank=True)
class DVOAFModel(RESTFrameworkModel): class DVOAFModel(RESTFrameworkModel):
positive_integer_field = models.PositiveIntegerField(blank=True) positive_integer_field = models.PositiveIntegerField(blank=True)
positive_small_integer_field = models.PositiveSmallIntegerField(blank=True) positive_small_integer_field = models.PositiveSmallIntegerField(blank=True)
email_field = models.EmailField(blank=True) email_field = models.EmailField(blank=True)
file_field = models.FileField(upload_to='test', blank=True) file_field = models.FileField(upload_to='test', blank=True)
image_field = models.ImageField(upload_to='test', blank=True) image_field = models.ImageField(upload_to='test', blank=True)
slug_field = models.SlugField(blank=True) slug_field = models.SlugField(blank=True)
url_field = models.URLField(blank=True) url_field = models.URLField(blank=True)
class SubComment(object): class SubComment(object):
@ -1568,6 +1574,7 @@ class ManyFieldHelpTextTest(TestCase):
self.assertEqual('Some help text.', rel_field.help_text) self.assertEqual('Some help text.', rel_field.help_text)
@unittest.skipUnless(PIL is not None, 'PIL is not installed')
class AttributeMappingOnAutogeneratedFieldsTests(TestCase): class AttributeMappingOnAutogeneratedFieldsTests(TestCase):
def setUp(self): def setUp(self):
@ -1640,6 +1647,7 @@ class AttributeMappingOnAutogeneratedFieldsTests(TestCase):
self.field_test('url_field') self.field_test('url_field')
@unittest.skipUnless(PIL is not None, 'PIL is not installed')
class DefaultValuesOnAutogeneratedFieldsTests(TestCase): class DefaultValuesOnAutogeneratedFieldsTests(TestCase):
def setUp(self): def setUp(self):