Skip to content

Commit

Permalink
Fix Gitlab.version()
Browse files Browse the repository at this point in the history
The method was overwritten by the result of the call.
  • Loading branch information
Gauvain Pocentek committed Aug 5, 2017
1 parent 0e70dd9 commit 45c4aaf
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions gitlab/__init__.py
Expand Up @@ -73,6 +73,7 @@ def __init__(self, url, private_token=None, email=None, password=None,
timeout=None, api_version='3', session=None):

self._api_version = str(api_version)
self._server_version = self._server_revision = None
self._url = '%s/api/v%s' % (url, api_version)
#: Timeout to use for requests to gitlab server
self.timeout = timeout
Expand Down Expand Up @@ -227,15 +228,17 @@ def version(self):
('unknown', 'unknwown') if the server doesn't
support this API call (gitlab < 8.13.0)
"""
r = self._raw_get('/version')
try:
raise_error_from_response(r, GitlabGetError, 200)
data = r.json()
self.version, self.revision = data['version'], data['revision']
except GitlabGetError:
self.version = self.revision = 'unknown'

return self.version, self.revision
if self._server_version is None:
r = self._raw_get('/version')
try:
raise_error_from_response(r, GitlabGetError, 200)
data = r.json()
self._server_version = data['version']
self._server_revision = data['revision']
except GitlabGetError:
self._server_version = self._server_revision = 'unknown'

return self._server_version, self._server_revision

def set_url(self, url):
"""Updates the GitLab URL.
Expand Down

0 comments on commit 45c4aaf

Please sign in to comment.