only allow integer field to accept integers and strings, fixes #2835

Ryan Allen · Ryan Allen · commit 3e6a149c91a5 · 2015-04-17T14:38:35.000-04:00
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
@@ -682,8 +682,9 @@ def to_internal_value(self, data):
             self.fail('max_string_length')
 
         try:
+            assert(isinstance(data, int) or isinstance(data, str))
             data = int(data)
-        except (ValueError, TypeError):
+        except (ValueError, TypeError, AssertionError):
             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,

Original file line number	Diff line number	Diff line change
`@@ -552,7 +552,8 @@ class TestIntegerField(FieldValues):`
`552`	`552`	`0.0: 0`
`553`	`553`	`}`
`554`	`554`	`invalid_inputs = {`
`555`		`- 'abc': ['A valid integer is required.']`
	`555`	`+ 'abc': ['A valid integer is required.'],`
	`556`	`+ 0.5: ['A valid integer is required.']`
`556`	`557`	`}`
`557`	`558`	`outputs = {`
`558`	`559`	`'1': 1,`