[Mega-Linter] Apply linters fixes

newrelic/common/package_version_utils.py

@@ -22,26 +22,27 @@
 
     _package_version_cache = {}
     _package_version_cache_lock = Lock()
+
     def _cache_package_versions(wrapped):
         """
         Threadsafe implementation of caching for _get_package_version.
-        
-        Python 2.7 does not have the @functools.cache decorator, and 
+
+        Python 2.7 does not have the @functools.cache decorator, and
         must be reimplemented with support for clearing the cache.
         """
 
         @wraps(wrapped)
         def _wrapper(name):
             if name in _package_version_cache:
                 return _package_version_cache[name]
-            
+
             with _package_version_cache_lock:
                 if name in _package_version_cache:
                     return _package_version_cache[name]
 
                 version = _package_version_cache[name] = wrapped(name)
                 return version
-        
+
         def cache_clear():
             """Cache clear function to mimic @functools.cache"""
             with _package_version_cache_lock:
@@ -113,7 +114,7 @@ def _get_package_version(name):
     if "importlib" in sys.modules and hasattr(sys.modules["importlib"], "metadata"):
         try:
             # In Python3.10+ packages_distribution can be checked for as well
-            if hasattr(sys.modules["importlib"].metadata, "packages_distributions"):    # pylint: disable=E1101
+            if hasattr(sys.modules["importlib"].metadata, "packages_distributions"):  # pylint: disable=E1101
                 distributions = sys.modules["importlib"].metadata.packages_distributions()  # pylint: disable=E1101
                 distribution_name = distributions.get(name, name)
             else:
@@ -145,4 +146,4 @@ def _get_package_version(name):
             if version not in NULL_VERSIONS:
                 return version
         except Exception:
-            pass
+            pass

tests/agent_unittests/test_package_version_utils.py

@@ -20,9 +20,9 @@
 from newrelic.common.package_version_utils import (
     NULL_VERSIONS,
     VERSION_ATTRS,
+    _get_package_version,
     get_package_version,
     get_package_version_tuple,
-    _get_package_version,
 )
 
 # Notes:
@@ -32,7 +32,7 @@
 # such as distribution_packages and removed pkg_resources.
 
 IS_PY38_PLUS = sys.version_info[:2] >= (3, 8)
-IS_PY310_PLUS = sys.version_info[:2] >= (3,10)
+IS_PY310_PLUS = sys.version_info[:2] >= (3, 10)
 SKIP_IF_NOT_IMPORTLIB_METADATA = pytest.mark.skipif(not IS_PY38_PLUS, reason="importlib.metadata is not supported.")
 SKIP_IF_IMPORTLIB_METADATA = pytest.mark.skipif(
     IS_PY38_PLUS, reason="importlib.metadata is preferred over pkg_resources."