revert a change which broke route templates that had tokens that weren't full segments

Author: tedchamb

azure-devops/azure/devops/client.py

@@ -124,23 +124,26 @@ 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
-        url = self._transform_route_template(location.route_template, route_values)
+        route_template = self._remove_optional_route_parameters(location.route_template,
+                                                                route_values)
         logger.debug('Route template: %s', location.route_template)
+        url = self._client.format_url(route_template, **route_values)
+        import pprint
+        pprint.pprint("url=" + url)
         request = ClientRequest(method=http_method, url=self._client.format_url(url))
         if query_parameters:
             request.format_parameters(query_parameters)
         return request
 
     @staticmethod
-    def _transform_route_template(route_template, route_values):
+    def _remove_optional_route_parameters(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 not path_segment[len(path_segment) - 1] == '}'
+                    or path_segment[1:len(path_segment) - 1] in route_values):
                 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):