Commit79be20a

authored and

committed

Updated supported values for the NullBooleanField (#5387)

* Updated supported values for the NullBooleanField.* Added check for unhashable types in NullBooleanField.

1 parente42eb42 commit79be20aCopy full SHA for 79be20a

File tree

+27

-10

lines changed

+27

-10

lines changed

Lines changed: 25 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -688,8 +688,22 @@ class NullBooleanField(Field):`
`688`	`688`	`'invalid':_('"{input}" is not a valid boolean.')`
`689`	`689`	`}`
`690`	`690`	`initial=None`
`691`		`-TRUE_VALUES= {'t','T','true','True','TRUE','1',1,True}`
`692`		`-FALSE_VALUES= {'f','F','false','False','FALSE','0',0,0.0,False}`
	`691`	`+TRUE_VALUES= {`
	`692`	`+'t','T',`
	`693`	`+'y','Y','yes','YES',`
	`694`	`+'true','True','TRUE',`
	`695`	`+'on','On','ON',`
	`696`	`+'1',1,`
	`697`	`+True`
	`698`	`+ }`
	`699`	`+FALSE_VALUES= {`
	`700`	`+'f','F',`
	`701`	`+'n','N','no','NO',`
	`702`	`+'false','False','FALSE',`
	`703`	`+'off','Off','OFF',`
	`704`	`+'0',0,0.0,`
	`705`	`+False`
	`706`	`+ }`
`693`	`707`	`NULL_VALUES= {'n','N','null','Null','NULL','',None}`
`694`	`708`
`695`	`709`	`def__init__(self,**kwargs):`
`@@ -698,12 +712,15 @@ def __init__(self, **kwargs):`
`698`	`712`	`super(NullBooleanField,self).__init__(**kwargs)`
`699`	`713`
`700`	`714`	`defto_internal_value(self,data):`
`701`		`-ifdatainself.TRUE_VALUES:`
`702`		`-returnTrue`
`703`		`-elifdatainself.FALSE_VALUES:`
`704`		`-returnFalse`
`705`		`-elifdatainself.NULL_VALUES:`
`706`		`-returnNone`
	`715`	`+try:`
	`716`	`+ifdatainself.TRUE_VALUES:`
	`717`	`+returnTrue`
	`718`	`+elifdatainself.FALSE_VALUES:`
	`719`	`+returnFalse`
	`720`	`+elifdatainself.NULL_VALUES:`
	`721`	`+returnNone`
	`722`	`+exceptTypeError:# Input is an unhashable type`
	`723`	`+pass`
`707`	`724`	`self.fail('invalid',input=data)`
`708`	`725`
`709`	`726`	`defto_representation(self,value):`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -587,15 +587,15 @@ def test_disallow_unhashable_collection_types(self):`
`587`	`587`	`[],`
`588`	`588`	`{},`
`589`	`589`	`)`
`590`		`-field=serializers.BooleanField()`
	`590`	`+field=self.field`
`591`	`591`	`forinput_valueininputs:`
`592`	`592`	`withpytest.raises(serializers.ValidationError)asexc_info:`
`593`	`593`	`field.run_validation(input_value)`
`594`	`594`	`expected= ['"{0}" is not a valid boolean.'.format(input_value)]`
`595`	`595`	`assertexc_info.value.detail==expected`
`596`	`596`
`597`	`597`
`598`		`-classTestNullBooleanField(FieldValues):`
	`598`	`+classTestNullBooleanField(TestBooleanField):`
`599`	`599`	`"""`
`600`	`600`	Valid and invalid values for `BooleanField`.
`601`	`601`	`"""`

Comments

(0)