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

Author: Ryan Allen

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
 

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,