diff options
| author | Gauvain Pocentek <gauvain@pocentek.net> | 2017-07-09 09:01:23 +0200 |
|---|---|---|
| committer | Gauvain Pocentek <gauvain@pocentek.net> | 2017-07-09 09:01:23 +0200 |
| commit | 274b3bffc3365eca2fd3fa10c1e7e9b49990533e (patch) | |
| tree | 445e4688164cff6f327494fc082dc0a0db476ed0 /gitlab | |
| parent | fe3a06c2a6a9776c22ff9120c99b3654e02e5e50 (diff) | |
| parent | cb8c1a198276cc6aa2a3ddbf52bcc3866418e9fd (diff) | |
| download | gitlab-274b3bffc3365eca2fd3fa10c1e7e9b49990533e.tar.gz | |
Merge branch 'master' into rework_api
Diffstat (limited to 'gitlab')
| -rw-r--r-- | gitlab/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gitlab/__init__.py b/gitlab/__init__.py index 4dd7e29..0696f34 100644 --- a/gitlab/__init__.py +++ b/gitlab/__init__.py @@ -34,7 +34,7 @@ from gitlab.exceptions import * # noqa from gitlab.v3.objects import * # noqa __title__ = 'python-gitlab' -__version__ = '0.21.1' +__version__ = '0.21.2' __author__ = 'Gauvain Pocentek' __email__ = 'gauvain@pocentek.net' __license__ = 'LGPL3' @@ -70,7 +70,7 @@ class Gitlab(object): def __init__(self, url, private_token=None, email=None, password=None, ssl_verify=True, http_username=None, http_password=None, - timeout=None, api_version='3'): + timeout=None, api_version='3', session=None): self._api_version = str(api_version) self._url = '%s/api/v%s' % (url, api_version) @@ -89,7 +89,7 @@ class Gitlab(object): self.http_password = http_password #: Create a session object for requests - self.session = requests.Session() + self.session = session or requests.Session() objects = importlib.import_module('gitlab.v%s.objects' % self._api_version) |