cleaning up

Author: abhidnya13

msal/oauth2cli/authcode.py

@@ -38,13 +38,14 @@ def obtain_auth_code(listen_port, auth_uri=None, text=None, request_state=None):
     """
     if text:
         exit_hint = "Visit http://localhost:{p}?auth_code=exit to abort".format(p=listen_port)
-        browse("http://localhost:{p}?{q}".format(
+        logger.warning(exit_hint)
+        page = "http://localhost:{p}?{q}".format(
                   p=listen_port, q=urlencode({
                       "text": text,
                       "link": auth_uri,
                       "exit_hint": exit_hint,
-                  })))
-        logger.warning(exit_hint)
+                  }))
+        browse(page)
     else:
         browse(auth_uri)
     server = AuthcodeRedirectServer(int(listen_port), request_state)

tests/test_e2e.py

@@ -12,12 +12,6 @@
 logger = logging.getLogger(__name__)
 logging.basicConfig(level=logging.INFO)
 
-try:  # Python 3
-    from urllib.parse import urlparse, parse_qs, urlencode
-except ImportError:  # Fall back to Python 2
-    from urllib import urlencode
-
-
 
 def _get_app_and_auth_code(
         client_id,
@@ -30,11 +24,9 @@ def _get_app_and_auth_code(
     app = msal.ClientApplication(
         client_id, client_secret, authority=authority, http_client=MinimalHttpClient())
     redirect_uri = "http://localhost:%d" % port
-    exit_hint = "Visit http://localhost:{p}?code=exit to abort".format(p=port)
     ac = obtain_auth_code(port, auth_uri=app.get_authorization_request_url(
-                        scopes, redirect_uri=redirect_uri),
-                        text="Open this link to sign in. You may use incognito window", **kwargs)
-    logger.warning(exit_hint)
+                        scopes, redirect_uri=redirect_uri, **kwargs),
+                        text="Open this link to sign in. You may use incognito window")
     assert ac is not None
     return (app, ac, redirect_uri)