Capturing editorial changes

msal/application.py

@@ -1,5 +1,4 @@
 import json
-import requests
 import time
 try:  # Python 2
     from urlparse import urljoin
@@ -10,6 +9,8 @@
 import warnings
 import uuid
 
+import requests
+
 from .oauth2cli import Client, JwtAssertionCreator
 from .authority import Authority
 from .mex import send_request as mex_send_request
@@ -90,7 +91,8 @@ class ClientApplication(object):
     def __init__(
             self, client_id,
             client_credential=None, authority=None, validate_authority=True,
-            token_cache=None, http_client=None,
+            token_cache=None,
+            http_client=None,
             verify=True, proxies=None, timeout=None,
             client_claims=None, app_name=None, app_version=None):
         """Create an instance of application.
@@ -140,7 +142,7 @@ def __init__(
             By default, an in-memory cache will be created and used.
         :param http_client: (optional)
             Your implementation of abstract class HttpClient <msal.oauth2cli.http.http_client>
-            Defaults to default http client implementation which uses requests
+            Defaults to a requests session instance
         :param verify: (optional)
             It will be passed to the
             `verify parameter in the underlying requests library
@@ -385,7 +387,8 @@ def _find_msal_accounts(self, environment):
 
     def _get_authority_aliases(self, instance):
         if not self.authority_groups:
-            resp = self.http_client.get("https://login.microsoftonline.com/common/discovery/instance?api-version=1.1&authorization_endpoint=https://login.microsoftonline.com/common/oauth2/authorize",
+            resp = self.http_client.get(
+                "https://login.microsoftonline.com/common/discovery/instance?api-version=1.1&authorization_endpoint=https://login.microsoftonline.com/common/oauth2/authorize",
                 headers={'Accept': 'application/json'},
                 timeout=self.timeout)
             resp.raise_for_status()
@@ -769,7 +772,8 @@ def _acquire_token_by_username_password_federated(
         wstrust_endpoint = {}
         if user_realm_result.get("federation_metadata_url"):
             wstrust_endpoint = mex_send_request(
-                user_realm_result["federation_metadata_url"], http_client=self.http_client)
+                user_realm_result["federation_metadata_url"],
+                http_client=self.http_client)
             if wstrust_endpoint is None:
                 raise ValueError("Unable to find wstrust endpoint from MEX. "
                     "This typically happens when attempting MSA accounts. "

msal/mex.py

@@ -41,9 +41,9 @@ def _xpath_of_root(route_to_leaf):
 
 
 def send_request(mex_endpoint, http_client, **kwargs):
-    resp = http_client.get(mex_endpoint, headers={'Content-Type': 'application/soap+xml'},
-                                    **kwargs)
-    mex_document = resp.text
+    mex_document = http_client.get(
+        mex_endpoint, headers={'Content-Type': 'application/soap+xml'},
+        **kwargs).text
     return Mex(mex_document).get_wstrust_username_password_endpoint()
 
 

msal/wstrust_request.py

@@ -48,8 +48,7 @@ def send_request(
         "Unsupported soap action: %s" % soap_action)
     data = _build_rst(
         username, password, cloud_audience_urn, endpoint_address, soap_action)
-    resp = http_client.post(endpoint_address, data=data,
-                                              headers={
+    resp = http_client.post(endpoint_address, data=data, headers={
             'Content-type':'application/soap+xml; charset=utf-8',
             'SOAPAction': soap_action,
             }, **kwargs)