From: John Mulligan <jmulligan@redhat.com>
Date: Wed, 12 Oct 2022 18:15:59 +0000 (-0400)
Subject: cephadm: fix base class behavior on python3.6
X-Git-Tag: v17.2.8~507^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F55593%2Fhead;p=ceph.git

cephadm: fix base class behavior on python3.6

This fixes the cephadm test files when running tox/pytest on python3.6
(centos/rhel 8).
Long story short, combining classmethod and property on py3.6 behaves
differently from py3.7 and up. Since the classmethod is actually
unnecessary for the base class to behave as it does, we drop that
decorator.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 7440d7a3c07d3e83ebb2ea7ac9cbbd94762e78ed)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 0e769043ab6d..47b245869d85 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -230,9 +230,8 @@ class ContainerEngine:
     def __init__(self) -> None:
         self.path = find_program(self.EXE)
 
-    @classmethod
     @property
-    def EXE(cls) -> str:
+    def EXE(self) -> str:
         raise NotImplementedError()
 
     def __str__(self) -> str: