Skip to content

Commit 9d300c7

Browse files
authored
Merge pull request #12 from Microsoft/users/tedchamb/initial
fix issue caused by asterisk prefix on route parameter
2 parents d5b898b + dea977f commit 9d300c7

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

vsts/vsts/vss_client.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ def add_user_agent(self, user_agent):
4141

4242
def _send_request(self, request, headers=None, content=None, **operation_config):
4343
"""Prepare and send request object according to configuration.
44-
4544
:param ClientRequest request: The request object to be sent.
4645
:param dict headers: Any headers to add to the request.
4746
:param content: Any body data to add to the request.
@@ -100,6 +99,7 @@ def _create_request_message(self, http_method, location_id, route_values=None,
10099
route_values['resource'] = location.resource_name
101100
route_template = self._remove_optional_route_parameters(location.route_template,
102101
route_values)
102+
logging.debug('Route template: %s', location.route_template)
103103
url = self._client.format_url(route_template, **route_values)
104104
request = ClientRequest()
105105
request.url = self._client.format_url(url)
@@ -111,9 +111,10 @@ def _create_request_message(self, http_method, location_id, route_values=None,
111111
@staticmethod
112112
def _remove_optional_route_parameters(route_template, route_values):
113113
new_template = ''
114+
route_template = route_template.replace('{*', '{')
114115
for path_segment in route_template.split('/'):
115-
if (len(path_segment) <= 2 or not path_segment[0:1] == '{'
116-
or not path_segment[len(path_segment) - 1:] == '}'
116+
if (len(path_segment) <= 2 or not path_segment[0] == '{'
117+
or not path_segment[len(path_segment) - 1] == '}'
117118
or path_segment[1:len(path_segment) - 1] in route_values):
118119
new_template = new_template + '/' + path_segment
119120
return new_template

0 commit comments

Comments
 (0)