From 58a68723b3389ec0d92f9372e213e6fc5d868708 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Sat, 5 Jul 2008 02:14:34 +0000 Subject: [PATCH] Changed a couple of old-style validators to remove some deprecation warnings when using ImageFields, etc, in the admin interface. Cosmetic only. Refs #7608. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7837 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/validators.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django/core/validators.py b/django/core/validators.py index e728dbc0ed..3ef0adeda6 100644 --- a/django/core/validators.py +++ b/django/core/validators.py @@ -177,7 +177,7 @@ def isValidImage(field_data, all_data): from PIL import Image from cStringIO import StringIO try: - content = field_data['content'] + content = field_data.read() except TypeError: raise ValidationError, _("No file was submitted. Check the encoding type on the form.") try: @@ -469,7 +469,7 @@ class HasAllowableSize(object): def __call__(self, field_data, all_data): try: - content = field_data['content'] + content = field_data.read() except TypeError: raise ValidationError, ugettext_lazy("No file was submitted. Check the encoding type on the form.") if self.min_size is not None and len(content) < self.min_size: