Remove redundant compatibility usage of importlib_metadata (apache#38368

)
mathiaHT · Apr 4, 2024 · 84b99fc · 84b99fc
1 parent c2772d3
commit 84b99fc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/airflow/providers/docker/hooks/docker.py b/airflow/providers/docker/hooks/docker.py
@@ -18,7 +18,6 @@
 from __future__ import annotations
 
 import json
-import sys
 import warnings
 from functools import cached_property
 from typing import TYPE_CHECKING, Any
@@ -105,12 +104,9 @@ def construct_tls_config(
         :param ssl_version: Version of SSL to use when communicating with docker daemon.
         """
         if ca_cert and client_cert and client_key:
-            from packaging.version import Version
+            from importlib.metadata import version
 
-            if sys.version_info >= (3, 9):
-                from importlib.metadata import version
-            else:
-                from importlib_metadata import version
+            from packaging.version import Version
 
             tls_config = {
                 "ca_cert": ca_cert,

diff --git a/tests/providers/docker/hooks/test_docker.py b/tests/providers/docker/hooks/test_docker.py
@@ -19,8 +19,8 @@
 
 import logging
 import ssl
-import sys
 import warnings
+from importlib.metadata import version
 from unittest import mock
 
 import pytest
@@ -31,12 +31,6 @@
 from airflow.exceptions import AirflowException, AirflowNotFoundException
 from airflow.providers.docker.hooks.docker import DockerHook
 
-if sys.version_info >= (3, 9):
-    from importlib.metadata import version
-else:
-    from importlib_metadata import version
-
-
 DOCKER_PY_7_PLUS = Version(Version(version("docker")).base_version) >= Version("7")
 
 TEST_CONN_ID = "docker_test_connection"