Using relative import for Python 3

Author: rayluo

msal/application.py

@@ -10,8 +10,8 @@
 from oauth2cli import Client
 from .authority import Authority
 from oauth2cli.assertion import JwtSigner
-import mex
-import wstrust_request
+from .mex import send_request as mex_send_request
+from .wstrust_request import send_request as wst_send_request
 from .wstrust_response import SAML_TOKEN_TYPE_V1, SAML_TOKEN_TYPE_V2
 from .token_cache import TokenCache
 
@@ -299,10 +299,10 @@ def _acquire_token_by_username_password_federated(
             self, user_realm_result, username, password, scopes=None, **kwargs):
         wstrust_endpoint = {}
         if user_realm_result.get("federation_metadata_url"):
-            wstrust_endpoint = mex.send_request(
+            wstrust_endpoint = mex_send_request(
                 user_realm_result["federation_metadata_url"])
         logger.debug("wstrust_endpoint = %s", wstrust_endpoint)
-        wstrust_result = wstrust_request.send_request(
+        wstrust_result = wst_send_request(
             username, password, user_realm_result.get("cloud_audience_urn"),
             wstrust_endpoint.get("address",
                 # Fallback to an AAD supplied endpoint

msal/wstrust_request.py

@@ -33,7 +33,7 @@
 import requests
 
 from .mex import Mex
-import wstrust_response
+from .wstrust_response import parse_response
 
 
 logger = logging.getLogger(__file__)
@@ -61,7 +61,7 @@ def send_request(
         logger.debug("Unsuccessful WsTrust request receives: %s", resp.text)
     # It turns out ADFS uses 5xx status code even with client-side incorrect password error
     # resp.raise_for_status()
-    return wstrust_response.parse_response(resp.text)
+    return parse_response(resp.text)
 
 def escape_password(password):
     return (password.replace('&', '&').replace('"', '"')