only allow integer field to accept integers and strings, fixes encode…

…#2835
ryangallen · Apr 17, 2015 · 6d4c85f · 6d4c85f
1 parent ecb37f5
commit 6d4c85f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
@@ -682,7 +682,7 @@ def to_internal_value(self, data):
             self.fail('max_string_length')
 
         try:
-            data = int(data)
+            data = int(re.compile(r'\.0*\s*$').sub('', str(data)))
         except (ValueError, TypeError):
             self.fail('invalid')
         return data

diff --git a/tests/test_fields.py b/tests/test_fields.py
@@ -552,7 +552,8 @@ class TestIntegerField(FieldValues):
         0.0: 0
     }
     invalid_inputs = {
-        'abc': ['A valid integer is required.']
+        'abc': ['A valid integer is required.'],
+        0.5: ['A valid integer is required.']
     }
     outputs = {
         '1': 1,