Commit4a2f187

Alex Schworer

committed

Allow for the JSON module to be configured.

Set `ZENCODER_PY_JSON_MODULE` to `simplejson` to use simplejson insteadof the built-in json module.

1 parent7a853f3 commit4a2f187Copy full SHA for 4a2f187

File tree

+11

-15

lines changed

+11

-15

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,10 @@ client = Zencoder('API_KEY')`
`28`	`28`	`client= Zencoder()`
`29`	`29`	```
`30`	`30`
	`31`	`+####Configuring the JSON Module`
	`32`	`+`
	`33`	+By default, zencoder-py uses the built-in`json` module, but you can optionally configure it to use`simplejson` by setting the`ZENCODER_PY_JSON_MODULE` environment variable to`simplejson`. Note that zencoder-py will not install either module, it must already be installed.
	`34`	`+`
`31`	`35`	`##[Jobs](https://app.zencoder.com/docs/api/jobs)`
`32`	`36`
`33`	`37`	`Create a[new job](https://app.zencoder.com/docs/api/jobs/create).`

Lines changed: 7 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,21 +2,13 @@`
`2`	`2`	`importrequests`
`3`	`3`	`fromdatetimeimportdatetime`
`4`	`4`
`5`		`-# Note: I've seen this pattern for dealing with json in different versions of`
`6`		`-# python in a lot of modules -- if there's a better way, I'd love to use it.`
`7`		`-try:`
`8`		`-# python 2.6 and greater`
`9`		`-importjson`
`10`		`-exceptImportError:`
`11`		`-try:`
`12`		`-# python 2.5`
`13`		`-importsimplejson`
`14`		`-json=simplejson`
`15`		`-exceptImportError:`
`16`		`-# if we're in django or Google AppEngine land`
`17`		`-# use this as a last resort`
`18`		`-fromdjango.utilsimportsimplejson`
`19`		`-json=simplejson`
	`5`	`+json_module=os.environ.get('ZENCODER_PY_JSON_MODULE','json')`
	`6`	`+valid_json_modules= ('json','simplejson')`
	`7`	`+ifjson_modulenotinvalid_json_modules:`
	`8`	`+msg='ZENCODER_PY_JSON_MODULE=%s is not supported. Supported JSON modules: %s'% (json_module,', '.join(valid_json_modules))`
	`9`	`+raiseRuntimeError(msg)`
	`10`	`+`
	`11`	`+json=__import__(json_module)`
`20`	`12`
`21`	`13`	`__version__='0.6.5'`
`22`	`14`

Comments

(0)