aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework
diff options
context:
space:
mode:
authorTom Christie2013-11-27 04:55:59 -0800
committerTom Christie2013-11-27 04:55:59 -0800
commit6ceb0fa94a3d0cc7b01ea56fe2abab1b85581630 (patch)
treeac980ef1628f131d02eb805344efb742bbdecd49 /rest_framework
parent43c4e3aab8b689bc846e52ef9bc512d1639205b6 (diff)
parentc46106c96158a99eb2ff29c464a2fa60aff23122 (diff)
downloaddjango-rest-framework-6ceb0fa94a3d0cc7b01ea56fe2abab1b85581630.tar.bz2
Merge pull request #1252 from thedrow/patch-3
Recommend using Pillow instead of PIL.
Diffstat (limited to 'rest_framework')
-rw-r--r--rest_framework/fields.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 6c07dbb3..463d296f 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -966,7 +966,7 @@ class ImageField(FileField):
return None
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
# have to read the data into memory.