[AIRFLOW-6162] Add back serialization as a module (#6718)

(cherry-picked from 0abefe9)
apache · Dec 19, 2019 · 4a45a58 · 4a45a58
1 parent 0915d00
commit 4a45a58
Show file tree

Hide file tree

Showing 7 changed files with 246 additions and 305 deletions.
diff --git a/airflow/models/baseoperator.py b/airflow/models/baseoperator.py
@@ -412,6 +412,10 @@ def __init__(
         if dag:
             self.dag = dag
 
+        # subdag parameter is only set for SubDagOperator.
+        # Setting it to None by default as other Operators do not have that field
+        self.subdag = None   # type: Optional[DAG]
+
         self._log = logging.getLogger("airflow.task.operators")
 
         # lineage

diff --git a/airflow/models/serialized_dag.py b/airflow/models/serialized_dag.py
@@ -29,7 +29,7 @@
 
 from airflow import DAG
 from airflow.models.base import ID_LEN, Base
-from airflow.serialization.serialized_dag import SerializedDAG
+from airflow.serialization.serialized_objects import SerializedDAG
 from airflow.settings import json
 from airflow.utils import db, timezone
 from airflow.utils.log.logging_mixin import LoggingMixin

diff --git a/airflow/serialization/serialized_baseoperator.py b/airflow/serialization/serialized_baseoperator.py
diff --git a/airflow/serialization/serialized_dag.py b/airflow/serialization/serialized_dag.py