From 2a03c72e63ce0f687d33f600cd5bdac07d7a609b Mon Sep 17 00:00:00 2001 From: Fokko Driesprong Date: Mon, 2 Oct 2017 15:14:24 +0200 Subject: [PATCH] [AIRFLOW-1669] Fix Docker import We want to fix the Docker import. At the revert of AIRFLOW-1368 something went wrong. --- airflow/operators/docker_operator.py | 2 +- tests/operators/docker_operator.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/airflow/operators/docker_operator.py b/airflow/operators/docker_operator.py index 3011f1c9b7642..f319cf44a796a 100644 --- a/airflow/operators/docker_operator.py +++ b/airflow/operators/docker_operator.py @@ -18,7 +18,7 @@ from airflow.models import BaseOperator from airflow.utils.decorators import apply_defaults from airflow.utils.file import TemporaryDirectory -from docker import Client, tls +from docker import APIClient as Client, tls import ast diff --git a/tests/operators/docker_operator.py b/tests/operators/docker_operator.py index 264096cc1d316..84585806ca02a 100644 --- a/tests/operators/docker_operator.py +++ b/tests/operators/docker_operator.py @@ -17,7 +17,7 @@ try: from airflow.operators.docker_operator import DockerOperator - from docker.client import Client + from docker import APIClient as Client except ImportError: pass