Merge pull request #240 from bnavigator/fix-ci2

Fix CI Fix and support decorated classmethod/staticmethod in Python 3.10
irmen · Dec 24, 2021 · b3c6c43 · b3c6c43
2 parents b303f7e + 41245bd
commit b3c6c43
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml
@@ -23,11 +23,11 @@ jobs:
 
     steps:
       - name: Checkout source
-      - uses: actions/checkout@v2
+        uses: actions/checkout@v2
       - name: Set up Python
         uses: actions/setup-python@v2
-          with:
-            python-version: ${{ matrix.python-version }}
+        with:
+          python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

diff --git a/src/Pyro4/core.py b/src/Pyro4/core.py
@@ -987,7 +987,7 @@ def expose(method_or_class):
         func._pyroExposed = True
         return method_or_class
     attrname = getattr(method_or_class, "__name__", None)
-    if not attrname:
+    if not attrname or isinstance(method_or_class, (classmethod, staticmethod)):
         # we could be dealing with a descriptor (classmethod/staticmethod), this means the order of the decorators is wrong
         if inspect.ismethoddescriptor(method_or_class):
             attrname = method_or_class.__get__(None, dict).__name__