diff options
| author | Takashi Kajinami <tkajinam@redhat.com> | 2022-06-21 21:53:16 +0900 |
|---|---|---|
| committer | Takashi Kajinami <tkajinam@redhat.com> | 2022-06-21 21:54:06 +0900 |
| commit | ccd17543a37143913e886f9306be10d40260fdf3 (patch) | |
| tree | 43f9ec7ced48d6d05db5ea537f73aa9f28331ac8 | |
| parent | 8efaa1ceb82300cce19acaf3d5ecd969f6dab3e0 (diff) | |
| download | stevedore-ccd17543a37143913e886f9306be10d40260fdf3.tar.gz | |
Fix remaining logic to support Python 3.6/74.0.0
... because this library no longer supports these old versions and
requires Python >= 3.8 now[1].
[1] 8efaa1ceb82300cce19acaf3d5ecd969f6dab3e0
Change-Id: I2b229b24425d3afb9159b2479bd9547e3443011f
| -rw-r--r-- | requirements.txt | 1 | ||||
| -rw-r--r-- | stevedore/_cache.py | 8 | ||||
| -rw-r--r-- | stevedore/tests/test_driver.py | 7 | ||||
| -rw-r--r-- | stevedore/tests/test_extension.py | 8 | ||||
| -rw-r--r-- | stevedore/tests/test_sphinxext.py | 7 |
5 files changed, 4 insertions, 27 deletions
diff --git a/requirements.txt b/requirements.txt index 06321a9..6de9f4e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,3 @@ # process, which may cause wedges in the gate later. pbr!=2.1.0,>=2.0.0 # Apache-2.0 -importlib_metadata>=1.7.0;python_version<'3.8' # Apache-2.0 diff --git a/stevedore/_cache.py b/stevedore/_cache.py index d0574f5..20b631d 100644 --- a/stevedore/_cache.py +++ b/stevedore/_cache.py @@ -15,6 +15,7 @@ import errno import glob import hashlib +import importlib.metadata as importlib_metadata import itertools import json import logging @@ -23,13 +24,6 @@ import os.path import struct import sys -try: - # For python 3.8 and later - import importlib.metadata as importlib_metadata -except ImportError: - # For everyone else - import importlib_metadata - log = logging.getLogger('stevedore._cache') diff --git a/stevedore/tests/test_driver.py b/stevedore/tests/test_driver.py index 9230835..622c171 100644 --- a/stevedore/tests/test_driver.py +++ b/stevedore/tests/test_driver.py @@ -13,12 +13,7 @@ """Tests for stevedore.extension """ -try: - # For python 3.8 and later - import importlib.metadata as importlib_metadata -except ImportError: - # For everyone else - import importlib_metadata +import importlib.metadata as importlib_metadata from stevedore import driver from stevedore import exception diff --git a/stevedore/tests/test_extension.py b/stevedore/tests/test_extension.py index 405fb88..7d6c6b8 100644 --- a/stevedore/tests/test_extension.py +++ b/stevedore/tests/test_extension.py @@ -13,16 +13,10 @@ """Tests for stevedore.extension """ +import importlib.metadata as importlib_metadata import operator from unittest import mock -try: - # For python 3.8 and later - import importlib.metadata as importlib_metadata -except ImportError: - # For everyone else - import importlib_metadata - from stevedore import exception from stevedore import extension from stevedore.tests import utils diff --git a/stevedore/tests/test_sphinxext.py b/stevedore/tests/test_sphinxext.py index e90bd67..2315c4e 100644 --- a/stevedore/tests/test_sphinxext.py +++ b/stevedore/tests/test_sphinxext.py @@ -12,12 +12,7 @@ """Tests for the sphinx extension """ -try: - # For python 3.8 and later - import importlib.metadata as importlib_metadata -except ImportError: - # For everyone else - import importlib_metadata +import importlib.metadata as importlib_metadata from stevedore import extension from stevedore import sphinxext |