Remove hack by only importing when configured

mtustin-handy · Nov 20, 2015 · 5881436 · 5881436
1 parent bc19b50
commit 5881436
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/airflow/executors/__init__.py b/airflow/executors/__init__.py
@@ -5,27 +5,19 @@
 from airflow.executors.local_executor import LocalExecutor
 from airflow.executors.sequential_executor import SequentialExecutor
 
-# TODO Fix this emergency fix
-try:
-    from airflow.executors.celery_executor import CeleryExecutor
-except:
-    pass
-try:
-    from airflow.contrib.executors.mesos_executor import MesosExecutor
-except:
-    pass
-
 from airflow.utils import AirflowException
 
 _EXECUTOR = configuration.get('core', 'EXECUTOR')
 
 if _EXECUTOR == 'LocalExecutor':
     DEFAULT_EXECUTOR = LocalExecutor()
 elif _EXECUTOR == 'CeleryExecutor':
+    from airflow.executors.celery_executor import CeleryExecutor
     DEFAULT_EXECUTOR = CeleryExecutor()
 elif _EXECUTOR == 'SequentialExecutor':
     DEFAULT_EXECUTOR = SequentialExecutor()
 elif _EXECUTOR == 'MesosExecutor':
+    from airflow.contrib.executors.mesos_executor import MesosExecutor
     DEFAULT_EXECUTOR = MesosExecutor()
 else:
     # Loading plugins