Clean up ValidationError error messages

Author: jleclanche

push_notifications/api/rest_framework.py

@@ -24,7 +24,7 @@ def to_internal_value(self, data):
 		try:
 			data = int(data, 16)
 		except ValueError:
-			raise ValidationError("ValidationError Device ID is not a valid hex number")
+			raise ValidationError("Device ID is not a valid hex number")
 		return super(HexIntegerField, self).to_internal_value(data)
 
 	def to_representation(self, value):
@@ -78,7 +78,7 @@ class Meta(DeviceSerializerMixin.Meta):
 	def validate_device_id(self, value):
 		# device ids are 64 bit unsigned values
 		if value > UNSIGNED_64BIT_INT_MAX_VALUE:
-			raise ValidationError("ValidationError Device ID is out of range")
+			raise ValidationError("Device ID is out of range")
 		return value
 
 

tests/mock_responses.py

@@ -11,7 +11,7 @@
 GCM_JSON_RESPONSE_ERROR_B = ('{"success":1, "failure": 2, "canonical_ids": 0, "cast_id": 6358665107659088804, '
 							 '"results": [{"error": "MismatchSenderId"}, {"message_id": '
 							 '"0:1433830664381654%3449593ff9fd7ecd"}, {"error": "InvalidRegistration"}]}')
-GCM_DRF_INVALID_HEX_ERROR = {'device_id': [u"ValidationError Device ID is not a valid hex number"]}
-GCM_DRF_OUT_OF_RANGE_ERROR = {'device_id': [u"ValidationError Device ID is out of range"]}
+GCM_DRF_INVALID_HEX_ERROR = {'device_id': [u"Device ID is not a valid hex number"]}
+GCM_DRF_OUT_OF_RANGE_ERROR = {'device_id': [u"Device ID is out of range"]}
 GCM_JSON_CANONICAL_ID_RESPONSE = '{"failure":0,"canonical_ids":1,"success":2,"multicast_id":7173139966327257000,"results":[{"registration_id":"NEW_REGISTRATION_ID","message_id":"0:1440068396670935%6868637df9fd7ecd"},{"message_id":"0:1440068396670937%6868637df9fd7ecd"}]}'
 GCM_JSON_CANONICAL_ID_SAME_DEVICE_RESPONSE = '{"failure":0,"canonical_ids":1,"success":2,"multicast_id":7173139966327257000,"results":[{"registration_id":"bar","message_id":"0:1440068396670935%6868637df9fd7ecd"},{"message_id":"0:1440068396670937%6868637df9fd7ecd"}]}'