Commit292dfff

authored

Merge pull request#1027 from nejch/fix/base-url-trailing-slash

Fix: remove trailing slash in base URL

2 parentse8f0921 +2e396e4 commit292dfffCopy full SHA for 292dfff

File tree

+19

-2

lines changed

+19

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -90,8 +90,8 @@ def __init__(`
`90`	`90`
`91`	`91`	`self._api_version=str(api_version)`
`92`	`92`	`self._server_version=self._server_revision=None`
`93`		`-self._base_url=url`
`94`		`-self._url="%s/api/v%s"% (url,api_version)`
	`93`	`+self._base_url=url.rstrip("/")`
	`94`	`+self._url="%s/api/v%s"% (self._base_url,api_version)`
`95`	`95`	`#: Timeout to use for requests to gitlab server`
`96`	`96`	`self.timeout=timeout`
`97`	`97`	`#: Headers that will be used in request to GitLab`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -376,6 +376,23 @@ def resp_cont(url, request):`
`376`	`376`	`self.assertRaises(GitlabHttpError,self.gl.http_delete,"/not_there")`
`377`	`377`
`378`	`378`
	`379`	`+classTestGitlabStripBaseUrl(unittest.TestCase):`
	`380`	`+defsetUp(self):`
	`381`	`+self.gl=Gitlab(`
	`382`	`+"http://localhost/",private_token="private_token",api_version=4`
	`383`	`+ )`
	`384`	`+`
	`385`	`+deftest_strip_base_url(self):`
	`386`	`+self.assertEqual(self.gl.url,"http://localhost")`
	`387`	`+`
	`388`	`+deftest_strip_api_url(self):`
	`389`	`+self.assertEqual(self.gl.api_url,"http://localhost/api/v4")`
	`390`	`+`
	`391`	`+deftest_build_url(self):`
	`392`	`+r=self.gl._build_url("/projects")`
	`393`	`+self.assertEqual(r,"http://localhost/api/v4/projects")`
	`394`	`+`
	`395`	`+`
`379`	`396`	`classTestGitlabAuth(unittest.TestCase):`
`380`	`397`	`deftest_invalid_auth_args(self):`
`381`	`398`	`self.assertRaises(`

Comments

(0)