From 60a4fee36e3a5f35e3b4149c5b14f6eb6de484bd Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 30 Oct 2024 00:31:24 +0900 Subject: [PATCH] Fix redundant format of enable_deprecated_api_versions The option can be a list of strings, instead of a list of lists of strings. Change-Id: I61902029a035584b64bccf5f395979c6080e96b8 --- zaqar/common/decorators.py | 2 +- zaqar/conf/default.py | 2 +- zaqar/tests/unit/common/test_decorators.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zaqar/common/decorators.py b/zaqar/common/decorators.py index cfab3e6ab..05a136b8c 100644 --- a/zaqar/common/decorators.py +++ b/zaqar/common/decorators.py @@ -203,7 +203,7 @@ def api_version_manager(version_info): @functools.wraps(fn) def register_api(driver, conf): if (deprecated and - [api_version] not in conf.enable_deprecated_api_versions): + api_version not in conf.enable_deprecated_api_versions): return None if deprecated: diff --git a/zaqar/conf/default.py b/zaqar/conf/default.py index 15c31903f..f58b0d8c8 100644 --- a/zaqar/conf/default.py +++ b/zaqar/conf/default.py @@ -35,7 +35,7 @@ unreliable = cfg.BoolOpt( enable_deprecated_api_versions = cfg.ListOpt( 'enable_deprecated_api_versions', default=[], - item_type=cfg.types.List(item_type=cfg.types.String(choices=('1', '1.1'))), + item_type=cfg.types.String(choices=('1', '1.1')), help='List of deprecated API versions to enable.') diff --git a/zaqar/tests/unit/common/test_decorators.py b/zaqar/tests/unit/common/test_decorators.py index 8d92c484e..0e61816af 100644 --- a/zaqar/tests/unit/common/test_decorators.py +++ b/zaqar/tests/unit/common/test_decorators.py @@ -175,7 +175,7 @@ class TestDecorators(base.TestBase): public_endpoint_2(None, self.conf) # 3. Test enabling deprecated API version - self.config(enable_deprecated_api_versions=[['1']]) + self.config(enable_deprecated_api_versions=['1']) @decorators.api_version_manager(VERSION) def public_endpoint_3(driver, conf):