mgr: return PyNone instead

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
ceph · May 26, 2021 · ce58c15 · ce58c15
1 parent 845a86e
commit ce58c15
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/mgr/ActivePyModules.cc b/src/mgr/ActivePyModules.cc
@@ -173,7 +173,7 @@ PyObject *ActivePyModules::get_python(const std::string &what)
     PyObject *injected_map = Injector::get_python(what);
     // Structures which have no injection implemented should
     // return the usual PyObject*
-    if (injected_map != nullptr) return injected_map;
+    if (injected_map != Py_None) return injected_map;
   }
   PyFormatter f;
 

diff --git a/src/mgr/Injector.cc b/src/mgr/Injector.cc
@@ -35,7 +35,9 @@ PyObject* Injector::get_python(const std::string& what) {
     Injector::mark_exists_osds(osdmap);
     osdmap->dump(&f);
   } else {
-    return nullptr;
+    Py_RETURN_NONE
   }
-  return f.get();
+  PyObject *obj = f.get();
+  Py_INCREF(obj);
+  return obj;
 }