module qualified class names

guruofquality · guruofquality · commit 3cb2a9c2519e · 2017-01-03T23:34:52.000-08:00
diff --git a/FrameworkTypes.cpp b/FrameworkTypes.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2016 Josh Blum
+// Copyright (c) 2016-2017 Josh Blum
 // SPDX-License-Identifier: BSL-1.0
 
 #include <Pothos/Plugin.hpp>
@@ -39,5 +39,5 @@ pothos_static_block(pothosRegisterNumpyBufferConversions)
     Pothos::PluginRegistry::addCall("/proxy/converters/python/buffer_chunk_to_numpy_array",
         &convertBufferChunkToNumpyArray);
     Pothos::PluginRegistry::add("/proxy/converters/python/numpy_array_to_buffer_chunk",
-        Pothos::ProxyConvertPair("ndarray", &convertNumpyArrayToBufferChunk));
+        Pothos::ProxyConvertPair("numpy.ndarray", &convertNumpyArrayToBufferChunk));
 }
diff --git a/PythonHandle.cpp b/PythonHandle.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2013-2016 Josh Blum
+// Copyright (c) 2013-2017 Josh Blum
 // SPDX-License-Identifier: BSL-1.0
 
 #include <Poco/Format.h>
@@ -58,9 +58,21 @@ std::string PythonProxyHandle::toString(void) const
 std::string PythonProxyHandle::getClassName(void) const
 {
     PyGilStateLock lock;
-    PyObjectRef type(PyObject_Type(obj), REF_NEW);
-    PyObjectRef name(PyObject_GetAttrString(type.obj, "__name__"), REF_NEW);
-    return PyObjToStdString(name.obj);
+
+    PyObjectRef cls(PyObject_GetAttrString(obj, "__class__"), REF_NEW);
+    PyObjectRef clsName(PyObject_GetAttrString(cls.obj, "__name__"), REF_NEW);
+    PyObjectRef modName(PyObject_GetAttrString(cls.obj, "__module__"), REF_NEW);
+
+    const auto clsNameStr = PyObjToStdString(clsName.obj);
+    const auto modNameStr = PyObjToStdString(modName.obj);
+
+    #if PY_MAJOR_VERSION >= 3
+    if (modNameStr == "builtins") return clsNameStr;
+    #else
+    if (modNameStr == "__builtin__") return clsNameStr;
+    #endif
+
+    return modNameStr + "." + clsNameStr;
 }
 
 Pothos::Proxy PythonProxyHandle::call(const std::string &name, const Pothos::Proxy *args, const size_t numArgs)
