Commit490f0c9

committed

Merge branch 'callorico-master'

2 parents75be919 +b6c4d8c commit490f0c9Copy full SHA for 490f0c9

File tree

+23

-0

lines changed

+23

-0

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,13 @@ def get_field_kwargs(field_name, model_field):`
`185`	`185`	`ifvalidatorisnotvalidators.validate_slug`
`186`	`186`	`]`
`187`	`187`
	`188`	`+# IPAddressField do not need to include the 'validate_ipv46_address' argument,`
	`189`	`+ifisinstance(model_field,models.GenericIPAddressField):`
	`190`	`+validator_kwarg= [`
	`191`	`+validatorforvalidatorinvalidator_kwarg`
	`192`	`+ifvalidatorisnotvalidators.validate_ipv46_address`
	`193`	`+ ]`
	`194`	`+`
`188`	`195`	`ifgetattr(model_field,'unique',False):`
`189`	`196`	`validator=UniqueValidator(queryset=model_field.model._default_manager)`
`190`	`197`	`validator_kwarg.append(validator)`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -344,6 +344,22 @@ class Meta:`
`344`	`344`	`self.assertEqual(unicode_repr(TestSerializer()),expected)`
`345`	`345`
`346`	`346`
	`347`	`+classTestGenericIPAddressFieldValidation(TestCase):`
	`348`	`+deftest_ip_address_validation(self):`
	`349`	`+classIPAddressFieldModel(models.Model):`
	`350`	`+address=models.GenericIPAddressField()`
	`351`	`+`
	`352`	`+classTestSerializer(serializers.ModelSerializer):`
	`353`	`+classMeta:`
	`354`	`+model=IPAddressFieldModel`
	`355`	`+`
	`356`	`+s=TestSerializer(data={'address':'not an ip address'})`
	`357`	`+self.assertFalse(s.is_valid())`
	`358`	`+self.assertEquals(1,len(s.errors['address']),`
	`359`	`+'Unexpected number of validation errors: '`
	`360`	`+'{0}'.format(s.errors))`
	`361`	`+`
	`362`	`+`
`347`	`363`	`# Tests for relational field mappings.`
`348`	`364`	`# ------------------------------------`
`349`	`365`

Comments

(0)