scancode_config: improve DistributionNotFound

In before get_distribution was run in the same scope as the import of
pkg_resources, but in the parent scope of the function
DistributionNotFound was used in the exception handler, leading to the
effect that on a failed import an undefined symbol was part of the ast.

Improve the handling by handing DistributionNotFound in the correct
inner scope, while handling ImportError of the outer one

Signed-off-by: Konrad Weihmann <[email protected]>

Author: priv-kweihmann

src/scancode_config.py

@@ -72,14 +72,17 @@ def _create_dir(location):
 # current installation location. This is where the source code and static data
 # lives.
 
-
+# in case package is not installed or we do not have setutools/pkg_resources
+# on hand fall back to this version
+__version__ = '21.3.31'
 try:
     from pkg_resources import get_distribution, DistributionNotFound
-    __version__ = get_distribution('scancode-toolkit').version
-except (DistributionNotFound, ImportError):
-    # package is not installed or we do not have setutools/pkg_resources
-    # on hand
-    __version__ = '21.3.31'
+    try:
+        __version__ = get_distribution('scancode-toolkit').version
+    except DistributionNotFound:
+        pass
+except ImportError:
+    pass
 
 system_temp_dir = tempfile.gettempdir()
 scancode_src_dir = dirname(__file__)