Movatterモバイル変換

Skip to content

zencoder/zencoder-pyPublic

NotificationsYou must be signed in to change notification settings
Fork24
Star63

Commit434d48f

author

Alex Schworer

committed

add cert path override parameter

1 parentb28961b commit434d48fCopy full SHA for 434d48f

File tree

2 files changed

+11

-0

lines changed

test
- test_zencoder.py
zencoder
- core.py

2 files changed

+11

-0

lines changed

`‎test/test_zencoder.py`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,13 @@ def test_set_verify_false(self):`
`55`	`55`
`56`	`56`	`self.assertEquals(zc.job.requests_params['verify'],False)`
`57`	`57`
	`58`	`+deftest_set_cert_path(self):`
	`59`	`+api_key='testapikey'`
	`60`	`+cert='/path/to/cert.pem'`
	`61`	`+zc=Zencoder(api_key=api_key,cert=cert)`
	`62`	`+`
	`63`	`+self.assertEquals(zc.job.requests_params['cert'],cert)`
	`64`	`+`
`58`	`65`	`if__name__=="__main__":`
`59`	`66`	`unittest.main()`
`60`	`67`

`‎zencoder/core.py`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ def __init__(self,`
`39`	`39`	`test=False,`
`40`	`40`	`version=None,`
`41`	`41`	`proxies=None,`
	`42`	`+cert=None,`
`42`	`43`	`verify=True):`
`43`	`44`
`44`	`45`	`self.base_url=base_url`
`@@ -53,6 +54,7 @@ def __init__(self,`
`53`	`54`	`self.requests_params= {`
`54`	`55`	`'timeout':timeout,`
`55`	`56`	`'proxies':proxies,`
	`57`	`+'cert':cert,`
`56`	`58`	`'verify':verify`
`57`	`59`	`}`
`58`	`60`
`@@ -159,6 +161,7 @@ def __init__(self,`
`159`	`161`	`timeout=None,`
`160`	`162`	`test=False,`
`161`	`163`	`proxies=None,`
	`164`	`+cert=None,`
`162`	`165`	`verify=True):`
`163`	`166`	`ifnotapi_version:`
`164`	`167`	`api_version='v2'`
`@@ -183,6 +186,7 @@ def __init__(self,`
`183`	`186`	`test=self.test,`
`184`	`187`	`version=api_version,`
`185`	`188`	`proxies=proxies,`
	`189`	`+cert=cert,`
`186`	`190`	`verify=verify)`
`187`	`191`
`188`	`192`	`self.job=Job(args,*kwargs)`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp