Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit44ef603

Browse files
committed
fix: use keyset pagination by default for /projects > 50000
Workaround forhttps://gitlab.com/gitlab-org/gitlab/-/issues/218504.Remove this in 13.1
1 parentef6181b commit44ef603

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

‎gitlab/__init__.py‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@
1616
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
"""Wrapper for the GitLab API."""
1818

19-
from __future__importprint_function
20-
from __future__importabsolute_import
2119
importimportlib
2220
importtime
2321
importwarnings
2422

2523
importrequests
24+
importrequests.utils
2625

2726
importgitlab.config
2827
fromgitlab.constimport*# noqa
@@ -43,6 +42,8 @@
4342
"must update your GitLab URL to use https:// to avoid issues."
4443
)
4544

45+
ALLOWED_KEYSET_ENDPOINTS= ["/projects"]
46+
4647

4748
def_sanitize(value):
4849
ifisinstance(value,dict):
@@ -618,7 +619,7 @@ def http_list(self, path, query_data=None, as_list=None, **kwargs):
618619
619620
Args:
620621
path (str): Path or full URL to query ('/projects' or
621-
'http://whatever/v4/api/projecs')
622+
'http://whatever/v4/api/projects')
622623
query_data (dict): Data to send as query parameters
623624
**kwargs: Extra options to send to the server (e.g. sudo, page,
624625
per_page)
@@ -642,6 +643,12 @@ def http_list(self, path, query_data=None, as_list=None, **kwargs):
642643
get_all=kwargs.pop("all",False)
643644
url=self._build_url(path)
644645

646+
# use keyset pagination automatically, if all=True
647+
order_by=kwargs.get("order_by")
648+
ifpathinALLOWED_KEYSET_ENDPOINTSand (notorder_byororder_by=="id"):
649+
kwargs["pagination"]="keyset"
650+
kwargs["order_by"]="id"
651+
645652
ifget_allisTrueandas_listisTrue:
646653
returnlist(GitlabList(self,url,query_data,**kwargs))
647654

@@ -781,7 +788,12 @@ def _query(self, url, query_data=None, **kwargs):
781788
query_data=query_dataor {}
782789
result=self._gl.http_request("get",url,query_data=query_data,**kwargs)
783790
try:
784-
self._next_url=result.links["next"]["url"]
791+
links=result.links
792+
iflinks:
793+
next_url=links["next"]["url"]
794+
else:
795+
next_url=requests.utils.parse_header_links(result.headers["links"])[0]["url"]
796+
self._next_url=next_url
785797
exceptKeyError:
786798
self._next_url=None
787799
self._current_page=result.headers.get("X-Page")

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp