Merge branch 'refactor-logging' into dev

Author: rayluo

msal_extensions/cache_lock.py

@@ -5,7 +5,6 @@
 import time
 import logging
 from distutils.version import LooseVersion
-import warnings
 
 import portalocker
 
@@ -33,16 +32,12 @@ def __init__(self, lockfile_path):
             flags=portalocker.LOCK_EX | portalocker.LOCK_NB,
             **open_kwargs)
 
-    def try_to_create_lock_file(self):
-        """Do not call this. It will be removed in next release"""
-        warnings.warn("try_to_create_lock_file() will be removed", DeprecationWarning)
-        return self._try_to_create_lock_file()
-
     def _try_to_create_lock_file(self):
         timeout = 5
         check_interval = 0.25
         current_time = getattr(time, "monotonic", time.time)
         timeout_end = current_time() + timeout
+        pid = os.getpid()
         while timeout_end > current_time():
             try:
                 with open(self._lockpath, 'x'):  # pylint: disable=unspecified-encoding
@@ -51,15 +46,18 @@ def _try_to_create_lock_file(self):
                 logger.warning("Python 2 does not support atomic creation of file")
                 return False
             except FileExistsError:  # Only Python 3 will reach this clause
-                logger.warning("Lock file exists, trying again after some time")
+                logger.debug(
+                    "Process %d found existing lock file, will retry after %f second",
+                    pid, check_interval)
                 time.sleep(check_interval)
         return False
 
     def __enter__(self):
+        pid = os.getpid()
         if not self._try_to_create_lock_file():
-            logger.warning("Failed to create lock file")
+            logger.warning("Process %d failed to create lock file", pid)
         file_handle = self._lock.__enter__()
-        file_handle.write('{} {}'.format(os.getpid(), sys.argv[0]).encode('utf-8'))
+        file_handle.write('{} {}'.format(pid, sys.argv[0]).encode('utf-8'))  # pylint: disable=consider-using-f-string
         return file_handle
 
     def __exit__(self, *args):
@@ -70,5 +68,5 @@ def __exit__(self, *args):
             # file for itself.
             os.remove(self._lockpath)
         except OSError as ex:  # pylint: disable=invalid-name
-            if ex.errno != errno.ENOENT and ex.errno != errno.EACCES:
+            if ex.errno not in (errno.ENOENT, errno.EACCES):
                 raise

msal_extensions/osx.py

@@ -21,10 +21,9 @@ def __init__(self, exit_status):
         self.exit_status = exit_status
         # TODO: pylint: disable=fixme
         #  use SecCopyErrorMessageString to fetch the appropriate message here.
-        self.message = \
-            '{} ' \
-            'see https://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/MacErrors.h'\
-                .format(self.exit_status)
+        self.message = (
+            '{} see https://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/MacErrors.h'  # pylint: disable=consider-using-f-string,line-too-long
+            .format(self.exit_status))
 
 def _get_native_location(name):
     # type: (str) -> str
@@ -33,7 +32,7 @@ def _get_native_location(name):
     :param name: The name of the library to be loaded.
     :return: The location of the library on a MacOS filesystem.
     """
-    return '/System/Library/Frameworks/{0}.framework/{0}'.format(name)
+    return '/System/Library/Frameworks/{0}.framework/{0}'.format(name)  # pylint: disable=consider-using-f-string
 
 
 # Load native MacOS libraries

msal_extensions/persistence.py

@@ -227,7 +227,7 @@ def load(self):
                     # This happens when a load() is called before a save().
                     # We map it into cross-platform error for unified catching.
                     raise PersistenceNotFound(
-                        location="Service:{} Account:{}".format(
+                        location="Service:{} Account:{}".format(  # pylint: disable=consider-using-f-string
                             self._service_name, self._account_name),
                         message=(
                             "Keychain persistence not initialized. "