encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-12-02 14:34:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1252 from thedrow/patch-3

Browse Source 
Recommend using Pillow instead of PIL.
This commit is contained in:
Tom Christie 2013-11-27 04:55:59 -08:00
commit 6ceb0fa94a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/api-guide/fields.md
View File

@ -286,7 +286,7 @@ An image representation.
Corresponds to `django.forms.fields.ImageField`. Corresponds to `django.forms.fields.ImageField`.
Requires the `PIL` package. Requires either the `Pillow` package or `PIL` package. The `Pillow` package is recommended, as `PIL` is no longer actively maintained.
Signature and validation is the same as with `FileField`. Signature and validation is the same as with `FileField`.

2
rest_framework/fields.py
View File

@ -966,7 +966,7 @@ class ImageField(FileField):
return None return None
from rest_framework.compat import Image from rest_framework.compat import Image
assert Image is not None, 'PIL must be installed for ImageField support' assert Image is not None, 'Either Pillow or PIL must be installed for ImageField support.'
# We need to get a file object for PIL. We might have a path or we might # We need to get a file object for PIL. We might have a path or we might
# have to read the data into memory. # have to read the data into memory.