fix(ingest): replace ImportError with ModuleNotFoundError (#2498)

Using the more specific exception will prevent us from accidentally
ignoring errors that should be handled.

metadata-ingestion/examples/airflow/generic_recipe_sample_dag.py

@@ -11,8 +11,9 @@ from airflow import DAG
 
 try:
     from airflow.operators.python import PythonOperator
-except ImportError:
+except ModuleNotFoundError:
     from airflow.operators.python_operator import PythonOperator
+
 from airflow.utils.dates import days_ago
 
 from datahub.ingestion.run.pipeline import Pipeline

metadata-ingestion/examples/airflow/lineage_backend_demo.py

@@ -10,7 +10,7 @@ from airflow.utils.dates import days_ago
 
 try:
     from airflow.operators.bash import BashOperator
-except ImportError:
+except ModuleNotFoundError:
     from airflow.operators.bash_operator import BashOperator
 
 from datahub.integrations.airflow.entities import Dataset

metadata-ingestion/examples/airflow/mysql_sample_dag.py

@@ -12,7 +12,7 @@ from airflow.utils.dates import days_ago
 
 try:
     from airflow.operators.python import PythonOperator
-except ImportError:
+except ModuleNotFoundError:
     from airflow.operators.python_operator import PythonOperator
 
 from datahub.ingestion.run.pipeline import Pipeline

metadata-ingestion/src/datahub/ingestion/api/registry.py

@@ -54,7 +54,7 @@ class Registry(Generic[T]):
 
             try:
                 plugin_class = entry_point.load()
-            except ImportError as e:
+            except ModuleNotFoundError as e:
                 self.register_disabled(name, e)
                 continue
 

metadata-ingestion/src/datahub/integrations/airflow/__init__.py

@@ -2,6 +2,6 @@ try:
     from datahub.integrations.airflow.lineage_backend import (
         DatahubAirflowLineageBackend,
     )
-except ImportError:
+except ModuleNotFoundError:
     # Compat for Airflow 2.x.
     pass

metadata-ingestion/src/datahub/integrations/airflow/hooks.py

@@ -6,7 +6,7 @@ try:
     from airflow.hooks.base import BaseHook
 
     AIRFLOW_1 = False
-except ImportError:
+except ModuleNotFoundError:
     from airflow.hooks.base_hook import BaseHook
 
     AIRFLOW_1 = True

metadata-ingestion/tests/unit/test_airflow.py

@@ -14,7 +14,7 @@ from airflow.utils.dates import days_ago
 
 try:
     from airflow.operators.dummy import DummyOperator
-except ImportError:
+except ModuleNotFoundError:
     from airflow.operators.dummy_operator import DummyOperator
 
 import datahub.emitter.mce_builder as builder

metadata-ingestion/tests/unit/test_plugin_system.py

@@ -43,7 +43,7 @@ def test_registry():
     # Make a mini sink registry.
     fake_registry = Registry[Sink]()
     fake_registry.register("console", ConsoleSink)
-    fake_registry.register_disabled("disabled", ImportError("disabled sink"))
+    fake_registry.register_disabled("disabled", ModuleNotFoundError("disabled sink"))
 
     class DummyClass:
         pass