From c0ea3284d705a5d66c8aff372a5e33b15dce56e7 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Mon, 19 Jun 2006 01:09:00 +0000 Subject: [PATCH] Fixed #1088 - Correctly detect when a float with too many digits before the decimal point is passed in. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3142 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/validators.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/django/core/validators.py b/django/core/validators.py index f09751e58d..f98589578e 100644 --- a/django/core/validators.py +++ b/django/core/validators.py @@ -355,6 +355,9 @@ class IsValidFloat(object): if len(data) > (self.max_digits + 1): raise ValidationError, ngettext("Please enter a valid decimal number with at most %s total digit.", "Please enter a valid decimal number with at most %s total digits.", self.max_digits) % self.max_digits + if (not '.' in data and len(data) > (self.max_digits - self.decimal_places)) or ('.' in data and len(data) > (self.max_digits - (self.decimal_places - len(data.split('.')[1])) + 1)): + raise ValidationError, ngettext( "Please enter a valid decimal number with a whole part of at most %s digit.", + "Please enter a valid decimal number with a whole part of at most %s digits.", str(self.max_digits-self.decimal_places)) % str(self.max_digits-self.decimal_places) if '.' in data and len(data.split('.')[1]) > self.decimal_places: raise ValidationError, ngettext("Please enter a valid decimal number with at most %s decimal place.", "Please enter a valid decimal number with at most %s decimal places.", self.decimal_places) % self.decimal_places