Commitb64f806

Ryan P Kilby

authored and

Carlton Gibson

committed

Add json util wrapper, failing JSONField test

1 parentf6c19e5 commitb64f806Copy full SHA for b64f806

File tree

+56

-1

lines changed

+56

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`"""`
`2`	`2`	`Helper classes for parsers.`
`3`	`3`	`"""`
`4`		`-from __future__importunicode_literals`
	`4`	`+from __future__importabsolute_import,unicode_literals`
`5`	`5`
`6`	`6`	`importdatetime`
`7`	`7`	`importdecimal`

Lines changed: 33 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,33 @@`
	`1`	`+`
	`2`	`+from __future__importabsolute_import`
	`3`	`+`
	`4`	`+importfunctools`
	`5`	`+importjson`
	`6`	`+`
	`7`	`+`
	`8`	`+defstrict_constant(o):`
	`9`	`+raiseValueError('Out of range float values are not JSON compliant: '+repr(o))`
	`10`	`+`
	`11`	`+`
	`12`	`+@functools.wraps(json.dump)`
	`13`	`+defdump(args,*kwargs):`
	`14`	`+kwargs.setdefault('allow_nan',False)`
	`15`	`+returnjson.dump(args,*kwargs)`
	`16`	`+`
	`17`	`+`
	`18`	`+@functools.wraps(json.dumps)`
	`19`	`+defdumps(args,*kwargs):`
	`20`	`+kwargs.setdefault('allow_nan',False)`
	`21`	`+returnjson.dumps(args,*kwargs)`
	`22`	`+`
	`23`	`+`
	`24`	`+@functools.wraps(json.load)`
	`25`	`+defload(args,*kwargs):`
	`26`	`+kwargs.setdefault('parse_constant',strict_constant)`
	`27`	`+returnjson.load(args,*kwargs)`
	`28`	`+`
	`29`	`+`
	`30`	`+@functools.wraps(json.loads)`
	`31`	`+defloads(args,*kwargs):`
	`32`	`+kwargs.setdefault('parse_constant',strict_constant)`
	`33`	`+returnjson.loads(args,*kwargs)`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1896,6 +1896,7 @@ class TestJSONField(FieldValues):`
`1896`	`1896`	`]`
`1897`	`1897`	`invalid_inputs= [`
`1898`	`1898`	`({'a':set()}, ['Value must be valid JSON.']),`
	`1899`	`+ ({'a':float('inf')}, ['Value must be valid JSON.']),`
`1899`	`1900`	`]`
`1900`	`1901`	`outputs= [`
`1901`	`1902`	`({`

Lines changed: 21 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`fromrest_framework.compatimport_resolve_model`
`10`	`10`	`fromrest_framework.routersimportSimpleRouter`
`11`	`11`	`fromrest_framework.serializersimportModelSerializer`
	`12`	`+fromrest_framework.utilsimportjson`
`12`	`13`	`fromrest_framework.utils.breadcrumbsimportget_breadcrumbs`
`13`	`14`	`fromrest_framework.viewsimportAPIView`
`14`	`15`	`fromrest_framework.viewsetsimportModelViewSet`
`@@ -177,3 +178,23 @@ def tearDown(self):`
`177`	`178`	`deftest_blows_up_if_model_does_not_resolve(self):`
`178`	`179`	`withself.assertRaises(ImproperlyConfigured):`
`179`	`180`	`_resolve_model('tests.BasicModel')`
	`181`	`+`
	`182`	`+`
	`183`	`+classJsonFloatTests(TestCase):`
	`184`	`+"""`
	`185`	`+ Internaly, wrapped json functions should adhere to strict float handling`
	`186`	`+ """`
	`187`	`+`
	`188`	`+deftest_dumps(self):`
	`189`	`+withself.assertRaises(ValueError):`
	`190`	`+json.dumps(float('inf'))`
	`191`	`+`
	`192`	`+withself.assertRaises(ValueError):`
	`193`	`+json.dumps(float('nan'))`
	`194`	`+`
	`195`	`+deftest_loads(self):`
	`196`	`+withself.assertRaises(ValueError):`
	`197`	`+json.loads("Infinity")`
	`198`	`+`
	`199`	`+withself.assertRaises(ValueError):`
	`200`	`+json.loads("NaN")`

Comments

(0)