Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set IntegerField class variable for compiled decimal regex, comment for ... #2853

Merged
merged 1 commit into from
Apr 21, 2015
Merged

Set IntegerField class variable for compiled decimal regex, comment for ... #2853

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion rest_framework/fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -682,7 +683,7 @@ def to_internal_value(self, data):
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
Expand Down