Merge pull request #138 from Microsoft/users/tedchamb/dev

bump dependency of msrest: "msrest>=0.6.0,<0.7.0"

Author: tedchamb

vsts/setup.py

@@ -16,7 +16,7 @@
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-    "msrest>=0.5.0,<0.6.0"
+    "msrest>=0.6.0,<0.7.0"
 ]
 
 CLASSIFIERS = [

vsts/vsts/git/v4_0/git_client.py

@@ -6,7 +6,7 @@
 # --------------------------------------------------------------------------
 
 
-from msrest.pipeline import ClientRequest
+from msrest.universal_http import ClientRequest
 from .git_client_base import GitClientBase
 
 
@@ -21,9 +21,8 @@ def __init__(self, base_url=None, creds=None):
         super(GitClient, self).__init__(base_url, creds)
 
     def get_vsts_info(self, relative_remote_url):
-        request = ClientRequest()
-        request.url = self._client.format_url(relative_remote_url.rstrip('/') + '/vsts/info')
-        request.method = 'GET'
+        url = self._client.format_url(relative_remote_url.rstrip('/') + '/vsts/info')
+        request = ClientRequest(method='GET', url=url)
         headers = {'Accept': 'application/json'}
         if self._suppress_fedauth_redirect:
             headers['X-TFS-FedAuthRedirect'] = 'Suppress'
@@ -34,9 +33,7 @@ def get_vsts_info(self, relative_remote_url):
 
     @staticmethod
     def get_vsts_info_by_remote_url(remote_url, credentials, suppress_fedauth_redirect=True):
-        request = ClientRequest()
-        request.url = remote_url.rstrip('/') + '/vsts/info'
-        request.method = 'GET'
+        request = ClientRequest(method='GET', url=remote_url.rstrip('/') + '/vsts/info')
         headers = {'Accept': 'application/json'}
         if suppress_fedauth_redirect:
             headers['X-TFS-FedAuthRedirect'] = 'Suppress'

vsts/vsts/git/v4_1/git_client.py

@@ -6,7 +6,7 @@
 # --------------------------------------------------------------------------
 
 
-from msrest.pipeline import ClientRequest
+from msrest.universal_http import ClientRequest
 from .git_client_base import GitClientBase
 
 
@@ -20,13 +20,26 @@ def __init__(self, base_url=None, creds=None):
         super(GitClient, self).__init__(base_url, creds)
 
     def get_vsts_info(self, relative_remote_url):
-        request = ClientRequest()
-        request.url = self._client.format_url(relative_remote_url.rstrip('/') + '/vsts/info')
-        request.method = 'GET'
+        url = self._client.format_url(relative_remote_url.rstrip('/') + '/vsts/info')
+        request = ClientRequest(method='GET', url=url)
         headers = {'Accept': 'application/json'}
         if self._suppress_fedauth_redirect:
             headers['X-TFS-FedAuthRedirect'] = 'Suppress'
         if self._force_msa_pass_through:
             headers['X-VSS-ForceMsaPassThrough'] = 'true'
         response = self._send_request(request, headers)
         return self._deserialize('VstsInfo', response)
+
+    @staticmethod
+    def get_vsts_info_by_remote_url(remote_url, credentials,
+                                    suppress_fedauth_redirect=True,
+                                    force_msa_pass_through=True):
+        request = ClientRequest(method='GET', url=remote_url.rstrip('/') + '/vsts/info')
+        headers = {'Accept': 'application/json'}
+        if suppress_fedauth_redirect:
+            headers['X-TFS-FedAuthRedirect'] = 'Suppress'
+        if force_msa_pass_through:
+            headers['X-VSS-ForceMsaPassThrough'] = 'true'
+        git_client = GitClient(base_url=remote_url, creds=credentials)
+        response = git_client._send_request(request, headers)
+        return git_client._deserialize('VstsInfo', response)

vsts/vsts/vss_client.py

@@ -12,7 +12,7 @@
 
 from msrest import Deserializer, Serializer
 from msrest.exceptions import DeserializationError, SerializationError
-from msrest.pipeline import ClientRequest
+from msrest.universal_http import ClientRequest
 from msrest.service_client import ServiceClient
 from .exceptions import VstsAuthenticationError, VstsClientRequestError, VstsServiceError
 from .vss_client_configuration import VssClientConfiguration
@@ -120,11 +120,9 @@ def _create_request_message(self, http_method, location_id, route_values=None,
                                                                 route_values)
         logger.debug('Route template: %s', location.route_template)
         url = self._client.format_url(route_template, **route_values)
-        request = ClientRequest()
-        request.url = self._client.format_url(url)
+        request = ClientRequest(method=http_method, url=self._client.format_url(url))
         if query_parameters:
             request.format_parameters(query_parameters)
-        request.method = http_method
         return request
 
     @staticmethod
@@ -167,12 +165,10 @@ def _get_resource_locations(self, all_host_types):
 
         # Last resort, make the call to the server
         options_uri = self._combine_url(self.config.base_url, '_apis')
-        request = ClientRequest()
-        request.url = self._client.format_url(options_uri)
+        request = ClientRequest(method='OPTIONS', url=self._client.format_url(options_uri))
         if all_host_types:
             query_parameters = {'allHostTypes': True}
             request.format_parameters(query_parameters)
-        request.method = 'OPTIONS'
         headers = {'Accept': 'application/json'}
         if self._suppress_fedauth_redirect:
             headers['X-TFS-FedAuthRedirect'] = 'Suppress'