Merge "Replace abc.abstractproperty with property and abc.abstractmethod"

2023-09-22 03:58:18 +00:00
parent 141787ae8b ab1ac4d180
commit c0dfeabfb9
2 changed files with 4 additions and 2 deletions
--- a/keystoneclient/tests/unit/auth/test_identity_common.py
+++ b/keystoneclient/tests/unit/auth/test_identity_common.py
@@ -79,7 +79,8 @@ class CommonIdentityTests(object):

        self.stub_auth(json=token)

-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
    def version(self):
        """The API version being tested."""

--- a/keystoneclient/v3/contrib/federation/base.py
+++ b/keystoneclient/v3/contrib/federation/base.py
@@ -25,7 +25,8 @@ class EntityManager(base.Manager):

    resource_class = None

-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
    def object_type(self):
        raise exceptions.MethodNotImplemented