Minor cleanup to prepare upcoming major revamp

Author: rayluo

msal/application.py

@@ -1,4 +1,4 @@
-from . import oauth2
+from .oauth2 import Client
 from .authority import Authority
 from .request import decorate_scope
 from .assertion import create_jwt_assertion
@@ -36,7 +36,7 @@ def acquire_token_silent(
             **kwargs):
         the_authority = Authority(authority) if authority else self.authority
         refresh_token = kwargs.get('refresh_token')  # For testing purpose
-        response = oauth2.Client(
+        response = Client(
             self.client_id, token_endpoint=the_authority.token_endpoint,
             default_body=self._build_auth_parameters(
                 self.client_credential,
@@ -98,7 +98,7 @@ def __init__(
 
     def acquire_token_for_client(self, scope, policy=None):
         token_endpoint = self.authority.token_endpoint
-        return oauth2.Client(
+        return Client(
             self.client_id, token_endpoint=token_endpoint,
             default_body=self._build_auth_parameters(
                 self.client_credential, token_endpoint, self.client_id)
@@ -131,7 +131,7 @@ def get_authorization_request_url(
         :param str state: Recommended by OAuth2 for CSRF protection.
         """
         the_authority = Authority(authority) if authority else self.authority
-        client = oauth2.Client(
+        client = Client(
             self.client_id,
             authorization_endpoint=the_authority.authorization_endpoint)
         return client.authorization_url(
@@ -174,7 +174,7 @@ def acquire_token_with_authorization_code(
         # So in theory, you can omit scope here when you were working with only
         # one scope. But, MSAL decorates your scope anyway, so they are never
         # really empty.
-        return oauth2.Client(
+        return Client(
             self.client_id, token_endpoint=self.authority.token_endpoint,
             default_body=self._build_auth_parameters(
                 self.client_credential,

tests/test_application.py

@@ -61,7 +61,8 @@ def test_get_authorization_request_url(self):
         # After user consent, your redirect endpoint will be hit like this:
         # http://localhost:8000/?code=blahblah&other_param=foo
 
-    def beautify(self, json_payload):
+    @classmethod
+    def beautify(cls, json_payload):
         return json.dumps(json_payload, indent=2)
 
     def test_acquire_token_with_authorization_code(self):