Commitc02dabd

Gauvain Pocentek

committed

Initial, non-functional v4 support

1 parentce3dd0d commitc02dabdCopy full SHA for c02dabd

File tree

+15

-4

lines changed

+15

-4

lines changed

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,10 @@ class Gitlab(object):`
`69`	`69`
`70`	`70`	`def__init__(self,url,private_token=None,email=None,password=None,`
`71`	`71`	`ssl_verify=True,http_username=None,http_password=None,`
`72`		`-timeout=None):`
	`72`	`+timeout=None,api_version='3'):`
`73`	`73`
`74`		`-self._url='%s/api/v3'%url`
	`74`	`+self._api_version=str(api_version)`
	`75`	`+self._url='%s/api/v%s'% (url,api_version)`
`75`	`76`	`#: Timeout to use for requests to gitlab server`
`76`	`77`	`self.timeout=timeout`
`77`	`78`	`#: Headers that will be used in request to GitLab`
`@@ -152,7 +153,8 @@ def from_config(gitlab_id=None, config_files=None):`
`152`	`153`	`returnGitlab(config.url,private_token=config.token,`
`153`	`154`	`ssl_verify=config.ssl_verify,timeout=config.timeout,`
`154`	`155`	`http_username=config.http_username,`
`155`		`-http_password=config.http_password)`
	`156`	`+http_password=config.http_password,`
	`157`	`+api_version=config.api_version)`
`156`	`158`
`157`	`159`	`defauth(self):`
`158`	`160`	`"""Performs an authentication.`
`@@ -212,7 +214,7 @@ def set_url(self, url):`
`212`	`214`	`Args:`
`213`	`215`	`url (str): Base URL of the GitLab server.`
`214`	`216`	`"""`
`215`		`-self._url='%s/api/v3'%url`
	`217`	`+self._url='%s/api/v%s'%(url,self._api_version)`
`216`	`218`
`217`	`219`	`def_construct_url(self,id_,obj,parameters,action=None):`
`218`	`220`	`if'next_url'inparameters:`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -88,3 +88,12 @@ def __init__(self, gitlab_id=None, config_files=None):`
`88`	`88`	`'http_password')`
`89`	`89`	`exceptException:`
`90`	`90`	`pass`
	`91`	`+`
	`92`	`+self.api_version='3'`
	`93`	`+try:`
	`94`	`+self.api_version=self._config.get(self.gitlab_id,'api_version')`
	`95`	`+exceptException:`
	`96`	`+pass`
	`97`	`+ifself.api_versionnotin ('3','4'):`
	`98`	`+raiseGitlabDataError("Unsupported API version: %s"%`
	`99`	`+self.api_version)`

Comments

(0)