@@ -408,13 +408,9 @@ def _delete(self, api_url, addl_keys=[], data=None):
408408 def _request (self , request_fn , api_url , addl_keys , data ):
409409 url = self ._get_url (api_url , addl_keys )
410410 #print "%s %s, data=%s" % (request_fn.__name__.upper(), url, str(data))
411- kwargs = {}
412- if self ._ssl_verify is not None :
413- kwargs ['verify' ] = self ._ssl_verify
414- if self ._ssl_cert is not None :
415- kwargs ['cert' ] = self ._ssl_cert
416411 try :
417- r = request_fn (url , headers = self ._headers , data = data ,** kwargs )
412+ r = request_fn (url , headers = self ._headers , data = data ,
413+ ** self ._requests_kwargs )
418414 except requests .exceptions .RequestException :
419415 msg = "'%s' request to '%s' failed" % (request_fn .__name__ , url )
420416 raise exceptions .ConnectionError (msg )
@@ -432,12 +428,17 @@ def __repr__(self):
432428class GitLab (_GitLabAPI ):
433429 """A GitLab API connection."""
434430
435- def __init__ (self , gitlab_url , token = None , convert_dates = True ,ssl_verify = None ,ssl_cert = None ):
431+ def __init__ (self , gitlab_url , token = None , convert_dates = True ,
432+ ssl_verify = None , ssl_cert = None ):
436433 setattr (_GitLabAPI , '_base_url' , gitlab_url + "/api/v3" )
437434 setattr (_GitLabAPI , '_headers' , {'PRIVATE-TOKEN' : token })
438435 setattr (_GitLabAPI , '_convert_dates_enabled' , convert_dates )
439- setattr (_GitLabAPI , '_ssl_verify' ,ssl_verify )
440- setattr (_GitLabAPI , '_ssl_cert' ,ssl_cert )
436+ requests_kwargs = {}
437+ if ssl_verify is not None :
438+ requests_kwargs ['verify' ] = ssl_verify
439+ if ssl_cert is not None :
440+ requests_kwargs ['cert' ] = ssl_cert
441+ setattr (_GitLabAPI , '_requests_kwargs' , requests_kwargs )
441442
442443 for sub_api in _GitLabAPIDefinition .sub_apis :
443444 cls = _add_api (sub_api , self )
0 commit comments