Skip to content

Move back to beta, until I can look at the two open issues. #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tedchamb merged 2 commits into from
Jul 25, 2019
Merged

Move back to beta, until I can look at the two open issues. #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0b5a07
Move back to beta, until I can look at the two open issues.
tedchamb Jul 25, 2019
143e245
update version
tedchamb Jul 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions azure-devops/azure/devops/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,24 +124,23 @@ def _create_request_message(self, http_method, location_id, route_values=None,
route_values = {}
route_values['area'] = location.area
route_values['resource'] = location.resource_name
route_template = self._remove_optional_route_parameters(location.route_template,
route_values)
url = self._transform_route_template(location.route_template, route_values)
logger.debug('Route template: %s', location.route_template)
url = self._client.format_url(route_template, **route_values)
request = ClientRequest(method=http_method, url=self._client.format_url(url))
if query_parameters:
request.format_parameters(query_parameters)
return request

@staticmethod
def _remove_optional_route_parameters(route_template, route_values):
def _transform_route_template(route_template, route_values):
new_template = ''
route_template = route_template.replace('{*', '{')
for path_segment in route_template.split('/'):
if (len(path_segment) <= 2 or not path_segment[0] == '{'
or not path_segment[len(path_segment) - 1] == '}'
or path_segment[1:len(path_segment) - 1] in route_values):
or not path_segment[len(path_segment) - 1] == '}'):
new_template = new_template + '/' + path_segment
elif path_segment[1:len(path_segment) - 1] in route_values:
new_template = new_template + '/' + route_values[path_segment[1:len(path_segment) - 1]]
return new_template

def _get_resource_location(self, location_id):
Expand Down Expand Up @@ -222,7 +221,7 @@ def _negotiate_request_version(location, version):
else:
# We can send at the requested api version. Make sure the resource version
# is not bigger than what the server supports
negotiated_version = str(requested_api_version)
negotiated_version = match.group(1)
is_preview = match.group(3) is not None
if is_preview:
negotiated_version += '-preview'
Expand Down Expand Up @@ -267,7 +266,7 @@ def _handle_error(self, request, response):
raise AzureDevOpsAuthenticationError(full_message_format.format(error_message=error_message,
url=request.url))
else:
full_message_format = '{error_message}Operation returned an invalid status code of {status_code}.'
full_message_format = '{error_message}Operation returned a {status_code} status code.'
raise AzureDevOpsClientRequestError(full_message_format.format(error_message=error_message,
status_code=response.status_code))

Expand Down
2 changes: 1 addition & 1 deletion azure-devops/azure/devops/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------

VERSION = "5.1.0"
VERSION = "5.1.0b1"
2 changes: 1 addition & 1 deletion azure-devops/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from setuptools import setup, find_packages

NAME = "azure-devops"
VERSION = "5.1.0"
VERSION = "5.1.0b1"

# To install the library, run the following
#
Expand Down