@@ -451,6 +451,10 @@ def http_request(
451451post_data :Optional [Dict [str ,Any ]]= None ,
452452streamed :bool = False ,
453453files :Optional [Dict [str ,Any ]]= None ,
454+ timeout :Optional [float ]= None ,
455+ obey_rate_limit :bool = True ,
456+ retry_transient_errors :bool = False ,
457+ max_retries :int = 10 ,
454458** kwargs :Any ,
455459 )-> requests .Response :
456460"""Make an HTTP request to the Gitlab server.
@@ -465,6 +469,14 @@ def http_request(
465469 json)
466470 streamed (bool): Whether the data should be streamed
467471 files (dict): The files to send to the server
472+ timeout (float): The timeout, in seconds, for the request
473+ obey_rate_limit (bool): Whether to obey 429 Too Many Request
474+ responses. Defaults to True.
475+ retry_transient_errors (bool): Whether to retry after 500, 502,
476+ 503, or 504 responses. Defaults
477+ to False.
478+ max_retries (int): Max retries after 429 or transient errors,
479+ set to -1 to retry forever. Defaults to 10.
468480 **kwargs: Extra options to send to the server (e.g. sudo)
469481
470482 Returns:
@@ -496,9 +508,10 @@ def http_request(
496508opts = self ._get_session_opts (content_type = "application/json" )
497509
498510verify = opts .pop ("verify" )
499- timeout = opts .pop ("timeout" )
511+ opts_timeout = opts .pop ("timeout" )
500512# If timeout was passed into kwargs, allow it to override the default
501- timeout = kwargs .get ("timeout" ,timeout )
513+ if timeout is None :
514+ timeout = opts_timeout
502515
503516# We need to deal with json vs. data when uploading files
504517if files :
@@ -532,15 +545,7 @@ def http_request(
532545prepped .url , {},streamed ,verify ,None
533546 )
534547
535- # obey the rate limit by default
536- obey_rate_limit = kwargs .get ("obey_rate_limit" ,True )
537- # do not retry transient errors by default
538- retry_transient_errors = kwargs .get ("retry_transient_errors" ,False )
539-
540- # set max_retries to 10 by default, disable by setting it to -1
541- max_retries = kwargs .get ("max_retries" ,10 )
542548cur_retries = 0
543-
544549while True :
545550result = self .session .send (prepped ,timeout = timeout ,** settings )
546551
@@ -827,6 +832,9 @@ def __init__(
827832self ._query (url ,query_data ,** self ._kwargs )
828833self ._get_next = get_next
829834
835+ # Remove query_parameters from kwargs, which are saved via the `next` URL
836+ self ._kwargs .pop ("query_parameters" ,None )
837+
830838def _query (
831839self ,url :str ,query_data :Optional [Dict [str ,Any ]]= None ,** kwargs :Any
832840 )-> None :