Merge pull request #1115 from python-gitlab/fix/keyset-pagination-revert · dibcon/python-gitlab@3f585ad · GitHub

1. dibcon
2. python-gitlab

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Commit 3f585ad

Browse filesBrowse the repository at this point in the historyBrowse files

bufferoverflow

authored

Merge pull request python-gitlab#1115 from python-gitlab/fix/keyset-pagination-revert

Fix/keyset pagination revert

2 parents 1f7dbc8 + 870e7ea commit 3f585ad
Copy full SHA for 3f585ad

2 files changed

+2-11Lines changed: 2 additions & 11 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• gitlab
  • __init__.py
• tools
  • python_test_v4.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎gitlab/__init__.py‎

Copy file name to clipboardExpand all lines: gitlab/__init__.py

+1-11Lines changed: 1 addition & 11 deletions

Original file line number	Diff line number	Diff line change
@@ -29,7 +29,7 @@
29	29	from gitlab import utils # noqa
30	30
31	31	__title__ = "python-gitlab"
32		- __version__ = "2.3.0"
	32	+ __version__ = "2.3.1"
33	33	__author__ = "Gauvain Pocentek"
34	34	__email__ = "gauvainpocentek@gmail.com"
35	35	__license__ = "LGPL3"
@@ -643,17 +643,7 @@ def http_list(self, path, query_data=None, as_list=None, **kwargs):
643	643	get_all = kwargs.pop("all", False)
644	644	url = self._build_url(path)
645	645
646		- order_by = kwargs.get("order_by")
647		- pagination = kwargs.get("pagination")
648	646	page = kwargs.get("page")
649		- if (
650		- path in ALLOWED_KEYSET_ENDPOINTS
651		- and (not order_by or order_by == "id")
652		- and (not pagination or pagination == "keyset")
653		- and not page
654		- ):
655		- kwargs["pagination"] = "keyset"
656		- kwargs["order_by"] = "id"
657	647
658	648	if get_all is True and as_list is True:
659	649	return list(GitlabList(self, url, query_data, **kwargs))

Collapse file

‎tools/python_test_v4.py‎

Copy file name to clipboardExpand all lines: tools/python_test_v4.py

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -421,6 +421,7 @@
421	421
422	422	assert len(gl.projects.list(owned=True)) == 2
423	423	assert len(gl.projects.list(search="admin")) == 1
	424	+ assert len(gl.projects.list(as_list=False)) == 4
424	425
425	426	# test pagination
426	427	l1 = gl.projects.list(per_page=1, page=1)

0 commit comments

Comments

0 (0)