encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-26 11:33:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2853 from ryangallen/master

Browse Source 
Set IntegerField class variable for compiled decimal regex, comment for ...
This commit is contained in:
Tom Christie 2015-04-21 16:00:37 +01:00
commit 0ca1145456
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rest_framework/fields.py
View File

@ -665,6 +665,7 @@ class IntegerField(Field):
'max_string_length': _('String value too large.')
}
MAX_STRING_LENGTH = 1000 # Guard against malicious string inputs.
re_decimal = re.compile(r'\.0*\s*$') # allow e.g. '1.0' as an int, but not '1.2'
def __init__(self, **kwargs):
self.max_value = kwargs.pop('max_value', None)
@ -682,7 +683,7 @@ class IntegerField(Field):
self.fail('max_string_length')
try:
data = int(re.compile(r'\.0*\s*$').sub('', str(data)))
data = int(self.re_decimal.sub('', str(data)))
except (ValueError, TypeError):
self.fail('invalid')
return data