7
7
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
8
8
# --------------------------------------------------------------------------
9
9
from typing import Any , AsyncIterable , Callable , Dict , IO , Optional , TypeVar , Union , cast , overload
10
- from urllib .parse import parse_qs , urljoin , urlparse
10
+ import urllib .parse
11
11
12
12
from azure .core .async_paging import AsyncItemPaged , AsyncList
13
13
from azure .core .exceptions import (
@@ -103,10 +103,17 @@ def prepare_request(next_link=None):
103
103
104
104
else :
105
105
# make call to next link with the client's api-version
106
- _parsed_next_link = urlparse (next_link )
107
- _next_request_params = case_insensitive_dict (parse_qs (_parsed_next_link .query ))
106
+ _parsed_next_link = urllib .parse .urlparse (next_link )
107
+ _next_request_params = case_insensitive_dict (
108
+ {
109
+ key : [urllib .parse .quote (v ) for v in value ]
110
+ for key , value in urllib .parse .parse_qs (_parsed_next_link .query ).items ()
111
+ }
112
+ )
108
113
_next_request_params ["api-version" ] = self ._config .api_version
109
- request = HttpRequest ("GET" , urljoin (next_link , _parsed_next_link .path ), params = _next_request_params )
114
+ request = HttpRequest (
115
+ "GET" , urllib .parse .urljoin (next_link , _parsed_next_link .path ), params = _next_request_params
116
+ )
110
117
request = _convert_request (request )
111
118
request .url = self ._client .format_url (request .url ) # type: ignore
112
119
request .method = "GET"
@@ -180,10 +187,17 @@ def prepare_request(next_link=None):
180
187
181
188
else :
182
189
# make call to next link with the client's api-version
183
- _parsed_next_link = urlparse (next_link )
184
- _next_request_params = case_insensitive_dict (parse_qs (_parsed_next_link .query ))
190
+ _parsed_next_link = urllib .parse .urlparse (next_link )
191
+ _next_request_params = case_insensitive_dict (
192
+ {
193
+ key : [urllib .parse .quote (v ) for v in value ]
194
+ for key , value in urllib .parse .parse_qs (_parsed_next_link .query ).items ()
195
+ }
196
+ )
185
197
_next_request_params ["api-version" ] = self ._config .api_version
186
- request = HttpRequest ("GET" , urljoin (next_link , _parsed_next_link .path ), params = _next_request_params )
198
+ request = HttpRequest (
199
+ "GET" , urllib .parse .urljoin (next_link , _parsed_next_link .path ), params = _next_request_params
200
+ )
187
201
request = _convert_request (request )
188
202
request .url = self ._client .format_url (request .url ) # type: ignore
189
203
request .method = "GET"
@@ -830,14 +844,16 @@ async def _renew_credentials_initial( # pylint: disable=inconsistent-return-sta
830
844
error_map .update (kwargs .pop ("error_map" , {}) or {})
831
845
832
846
_headers = kwargs .pop ("headers" , {}) or {}
833
- _params = kwargs .pop ("params" , {}) or {}
847
+ _params = case_insensitive_dict ( kwargs .pop ("params" , {}) or {})
834
848
849
+ api_version = kwargs .pop ("api_version" , _params .pop ("api-version" , self ._config .api_version )) # type: str
835
850
cls = kwargs .pop ("cls" , None ) # type: ClsType[None]
836
851
837
852
request = build_renew_credentials_request (
838
853
resource_group_name = resource_group_name ,
839
854
account_name = account_name ,
840
855
subscription_id = self ._config .subscription_id ,
856
+ api_version = api_version ,
841
857
template_url = self ._renew_credentials_initial .metadata ["url" ],
842
858
headers = _headers ,
843
859
params = _params ,
@@ -887,8 +903,9 @@ async def begin_renew_credentials(
887
903
:raises ~azure.core.exceptions.HttpResponseError:
888
904
"""
889
905
_headers = kwargs .pop ("headers" , {}) or {}
890
- _params = kwargs .pop ("params" , {}) or {}
906
+ _params = case_insensitive_dict ( kwargs .pop ("params" , {}) or {})
891
907
908
+ api_version = kwargs .pop ("api_version" , _params .pop ("api-version" , self ._config .api_version )) # type: str
892
909
cls = kwargs .pop ("cls" , None ) # type: ClsType[None]
893
910
polling = kwargs .pop ("polling" , True ) # type: Union[bool, AsyncPollingMethod]
894
911
lro_delay = kwargs .pop ("polling_interval" , self ._config .polling_interval )
@@ -897,6 +914,7 @@ async def begin_renew_credentials(
897
914
raw_result = await self ._renew_credentials_initial ( # type: ignore
898
915
resource_group_name = resource_group_name ,
899
916
account_name = account_name ,
917
+ api_version = api_version ,
900
918
cls = lambda x , y , z : x ,
901
919
headers = _headers ,
902
920
params = _params ,
0 commit comments