fix mypy issue with importlib imports, see pydata#5979

kmuehlbauer · Nov 14, 2021 · 697b112 · 697b112
1 parent e132893
commit 697b112
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/xarray/backends/plugins.py b/xarray/backends/plugins.py
@@ -1,15 +1,16 @@
 import functools
 import inspect
 import itertools
+import sys
 import warnings
 
 from .common import BACKEND_ENTRYPOINTS, BackendEntrypoint
 
-try:
+if sys.version_info >= (3, 8):
     from importlib.metadata import entry_points
-except ImportError:
+else:
     # if the fallback library is missing, we are doomed.
-    from importlib_metadata import entry_points  # type: ignore[no-redef]
+    from importlib_metadata import entry_points
 
 
 STANDARD_BACKENDS_ORDER = ["netcdf4", "h5netcdf", "scipy"]

diff --git a/xarray/tests/test_plugins.py b/xarray/tests/test_plugins.py
@@ -1,16 +1,17 @@
+import sys
 from unittest import mock
 
 import pytest
 
 from xarray.backends import common, plugins
 
-try:
+if sys.version_info >= (3, 8):
     from importlib.metadata import EntryPoint
 
     importlib_metadata_mock = "importlib.metadata"
-except ImportError:
+else:
     # if the fallback library is missing, we are doomed.
-    from importlib_metadata import EntryPoint  # type: ignore[no-redef]
+    from importlib_metadata import EntryPoint
 
     importlib_metadata_mock = "importlib_metadata"