From 1d011ac72aeb18b5f31d10e42ffb49cf703c3e3a Mon Sep 17 00:00:00 2001 From: Tyler Yates Date: Mon, 22 Jun 2020 15:21:55 -0500 Subject: fix: pass kwargs to subsequent queries in gitlab list --- gitlab/__init__.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gitlab/__init__.py b/gitlab/__init__.py index ee2b074..ea29524 100644 --- a/gitlab/__init__.py +++ b/gitlab/__init__.py @@ -780,6 +780,12 @@ class GitlabList(object): self._query(url, query_data, **kwargs) self._get_next = get_next + # Preserve kwargs for subsequent queries + if kwargs is None: + self._kwargs = {} + else: + self._kwargs = kwargs.copy() + def _query(self, url, query_data=None, **kwargs): query_data = query_data or {} result = self._gl.http_request("get", url, query_data=query_data, **kwargs) @@ -864,7 +870,7 @@ class GitlabList(object): pass if self._next_url and self._get_next is True: - self._query(self._next_url) + self._query(self._next_url, **self._kwargs) return self.next() raise StopIteration -- cgit v1.2.1 From 72ffa0164edc44a503364f9b7e25c5b399f648c3 Mon Sep 17 00:00:00 2001 From: Tyler Yates Date: Mon, 22 Jun 2020 16:14:57 -0500 Subject: fix: make query kwargs consistent between call in init and next --- gitlab/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gitlab/__init__.py b/gitlab/__init__.py index ea29524..53815f8 100644 --- a/gitlab/__init__.py +++ b/gitlab/__init__.py @@ -777,8 +777,6 @@ class GitlabList(object): def __init__(self, gl, url, query_data, get_next=True, **kwargs): self._gl = gl - self._query(url, query_data, **kwargs) - self._get_next = get_next # Preserve kwargs for subsequent queries if kwargs is None: @@ -786,6 +784,9 @@ class GitlabList(object): else: self._kwargs = kwargs.copy() + self._query(url, query_data, **self._kwargs) + self._get_next = get_next + def _query(self, url, query_data=None, **kwargs): query_data = query_data or {} result = self._gl.http_request("get", url, query_data=query_data, **kwargs) -- cgit v1.2.1 From a349b90ea6016ec8fbe91583f2bbd9832b41a368 Mon Sep 17 00:00:00 2001 From: tyates-indeed <57921587+tyates-indeed@users.noreply.github.com> Date: Tue, 23 Jun 2020 11:01:43 -0500 Subject: fix: do not check if kwargs is none Co-authored-by: Traian Nedelea --- gitlab/__init__.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gitlab/__init__.py b/gitlab/__init__.py index 53815f8..226fdf6 100644 --- a/gitlab/__init__.py +++ b/gitlab/__init__.py @@ -779,10 +779,7 @@ class GitlabList(object): self._gl = gl # Preserve kwargs for subsequent queries - if kwargs is None: - self._kwargs = {} - else: - self._kwargs = kwargs.copy() + self._kwargs = kwargs.copy() self._query(url, query_data, **self._kwargs) self._get_next = get_next -- cgit v1.2.1