Move all python classes to proper namespace

AcademySoftwareFoundation · Sep 16, 2016 · dbb2220 · dbb2220
1 parent 61bcbea
commit dbb2220
Show file tree

Hide file tree

Showing 22 changed files with 27 additions and 22 deletions.
diff --git a/src/pyglue/CMakeLists.txt b/src/pyglue/CMakeLists.txt
@@ -29,6 +29,8 @@ file( GLOB pyglue_src_files "${CMAKE_SOURCE_DIR}/src/pyglue/*.cpp" )
 
 add_library(PyOpenColorIO MODULE ${pyglue_src_files} ${CMAKE_BINARY_DIR}/src/pyglue/PyDoc.h)
 
+add_definitions(-DPYOCIO_NAME=PyOpenColorIO)
+
 if(OCIO_USE_BOOST_PTR)
     include_directories(
         ${CMAKE_SOURCE_DIR}/export/

diff --git a/src/pyglue/PyAllocationTransform.cpp b/src/pyglue/PyAllocationTransform.cpp
@@ -84,7 +84,7 @@ OCIO_NAMESPACE_ENTER
 
     PyTypeObject PyOCIO_AllocationTransformType = {
         PyVarObject_HEAD_INIT(NULL, 0)              //ob_size
-        "OCIO.AllocationTransform",                 //tp_name
+        OCIO_PYTHON_NAMESPACE(AllocationTransform), //tp_name
         sizeof(PyOCIO_Transform),                   //tp_basicsize
         0,                                          //tp_itemsize
         0,                                          //tp_dealloc

diff --git a/src/pyglue/PyBaker.cpp b/src/pyglue/PyBaker.cpp
@@ -154,7 +154,7 @@ OCIO_NAMESPACE_ENTER
 
     PyTypeObject PyOCIO_BakerType = {
         PyVarObject_HEAD_INIT(NULL, 0)              //ob_size
-        "OCIO.Baker",                               //tp_name
+        OCIO_PYTHON_NAMESPACE(Baker),               //tp_name
         sizeof(PyOCIO_Baker),                       //tp_basicsize
         0,                                          //tp_itemsize
         (destructor)PyOCIO_Baker_delete,            //tp_dealloc

diff --git a/src/pyglue/PyCDLTransform.cpp b/src/pyglue/PyCDLTransform.cpp
@@ -120,7 +120,7 @@ OCIO_NAMESPACE_ENTER
 
     PyTypeObject PyOCIO_CDLTransformType = {
         PyVarObject_HEAD_INIT(NULL, 0)
-        "OCIO.CDLTransform",                        //tp_name
+        OCIO_PYTHON_NAMESPACE(CDLTransform),        //tp_name
         sizeof(PyOCIO_Transform),                   //tp_basicsize
         0,                                          //tp_itemsize
         0,                                          //tp_dealloc

diff --git a/src/pyglue/PyColorSpace.cpp b/src/pyglue/PyColorSpace.cpp
@@ -153,7 +153,7 @@ OCIO_NAMESPACE_ENTER
 
     PyTypeObject PyOCIO_ColorSpaceType = {
         PyVarObject_HEAD_INIT(NULL, 0)              //ob_size 
-        "OCIO.ColorSpace",                          //tp_name
+        OCIO_PYTHON_NAMESPACE(ColorSpace),          //tp_name
         sizeof(PyOCIO_ColorSpace),                  //tp_basicsize
         0,                                          //tp_itemsize
         (destructor)PyOCIO_ColorSpace_delete,       //tp_dealloc

diff --git a/src/pyglue/PyColorSpaceTransform.cpp b/src/pyglue/PyColorSpaceTransform.cpp
@@ -77,7 +77,7 @@ OCIO_NAMESPACE_ENTER
 
     PyTypeObject PyOCIO_ColorSpaceTransformType = {
         PyVarObject_HEAD_INIT(NULL, 0)
-        "OCIO.ColorSpaceTransform",                 //tp_name
+        OCIO_PYTHON_NAMESPACE(ColorSpaceTransform), //tp_name
         sizeof(PyOCIO_Transform),                   //tp_basicsize
         0,                                          //tp_itemsize
         0,                                          //tp_dealloc

diff --git a/src/pyglue/PyConfig.cpp b/src/pyglue/PyConfig.cpp
@@ -276,7 +276,7 @@ OCIO_NAMESPACE_ENTER
 
     PyTypeObject PyOCIO_ConfigType = {
         PyVarObject_HEAD_INIT(NULL, 0)              //obsize
-        "OCIO.Config",                              //tp_name
+        OCIO_PYTHON_NAMESPACE(Config),              //tp_name
         sizeof(PyOCIO_Config),                      //tp_basicsize
         0,                                          //tp_itemsize
         (destructor)PyOCIO_Config_delete,           //tp_dealloc

diff --git a/src/pyglue/PyContext.cpp b/src/pyglue/PyContext.cpp
@@ -145,7 +145,7 @@ OCIO_NAMESPACE_ENTER
 
     PyTypeObject PyOCIO_ContextType = {
         PyVarObject_HEAD_INIT(NULL, 0)              //ob_size
-        "OCIO.Context",                             //tp_name
+        OCIO_PYTHON_NAMESPACE(Context),             //tp_name
         sizeof(PyOCIO_Context),                     //tp_basicsize
         0,                                          //tp_itemsize
         (destructor)PyOCIO_Context_delete,          //tp_dealloc

diff --git a/src/pyglue/PyDisplayTransform.cpp b/src/pyglue/PyDisplayTransform.cpp
@@ -118,7 +118,7 @@ OCIO_NAMESPACE_ENTER
 
     PyTypeObject PyOCIO_DisplayTransformType = {
         PyVarObject_HEAD_INIT(NULL, 0)
-        "OCIO.DisplayTransform",                    //tp_name
+        OCIO_PYTHON_NAMESPACE(DisplayTransform),    //tp_name
         sizeof(PyOCIO_Transform),                   //tp_basicsize
         0,                                          //tp_itemsize
         0,                                          //tp_dealloc

diff --git a/src/pyglue/PyExponentTransform.cpp b/src/pyglue/PyExponentTransform.cpp
@@ -71,7 +71,7 @@ OCIO_NAMESPACE_ENTER
 
     PyTypeObject PyOCIO_ExponentTransformType = {
         PyVarObject_HEAD_INIT(NULL, 0)
-        "OCIO.ExponentTransform",                   //tp_name
+        OCIO_PYTHON_NAMESPACE(ExponentTransform),   //tp_name
         sizeof(PyOCIO_Transform),                   //tp_basicsize
         0,                                          //tp_itemsize
         0,                                          //tp_dealloc

diff --git a/src/pyglue/PyFileTransform.cpp b/src/pyglue/PyFileTransform.cpp
@@ -92,7 +92,7 @@ OCIO_NAMESPACE_ENTER
 
     PyTypeObject PyOCIO_FileTransformType = {
         PyVarObject_HEAD_INIT(NULL, 0)
-        "OCIO.FileTransform",                       //tp_name
+        OCIO_PYTHON_NAMESPACE(FileTransform),       //tp_name
         sizeof(PyOCIO_Transform),                   //tp_basicsize
         0,                                          //tp_itemsize
         0,                                          //tp_dealloc

diff --git a/src/pyglue/PyGpuShaderDesc.cpp b/src/pyglue/PyGpuShaderDesc.cpp
@@ -91,7 +91,7 @@ OCIO_NAMESPACE_ENTER
 
     PyTypeObject PyOCIO_GpuShaderDescType = {
         PyVarObject_HEAD_INIT(NULL, 0)              //ob_size
-        "OCIO.GpuShaderDesc",                       //tp_name
+        OCIO_PYTHON_NAMESPACE(GpuShaderDesc),       //tp_name
         sizeof(PyOCIO_GpuShaderDesc),               //tp_basicsize
         0,                                          //tp_itemsize
         (destructor)PyOCIO_GpuShaderDesc_delete,    //tp_dealloc

diff --git a/src/pyglue/PyGroupTransform.cpp b/src/pyglue/PyGroupTransform.cpp
@@ -87,7 +87,7 @@ OCIO_NAMESPACE_ENTER
 
     PyTypeObject PyOCIO_GroupTransformType = {
         PyVarObject_HEAD_INIT(NULL, 0)
-        "OCIO.GroupTransform",                    //tp_name
+        OCIO_PYTHON_NAMESPACE(GroupTransform),      //tp_name
         sizeof(PyOCIO_Transform),                   //tp_basicsize
         0,                                          //tp_itemsize
         0,                                          //tp_dealloc

diff --git a/src/pyglue/PyLogTransform.cpp b/src/pyglue/PyLogTransform.cpp
@@ -71,7 +71,7 @@ OCIO_NAMESPACE_ENTER
 
     PyTypeObject PyOCIO_LogTransformType = {
         PyVarObject_HEAD_INIT(NULL, 0)
-        "OCIO.LogTransform",                        //tp_name
+        OCIO_PYTHON_NAMESPACE(LogTransform),        //tp_name
         sizeof(PyOCIO_Transform),                   //tp_basicsize
         0,                                          //tp_itemsize
         0,                                          //tp_dealloc

diff --git a/src/pyglue/PyLook.cpp b/src/pyglue/PyLook.cpp
@@ -130,7 +130,7 @@ OCIO_NAMESPACE_ENTER
 
     PyTypeObject PyOCIO_LookType = {
         PyVarObject_HEAD_INIT(NULL, 0)              //ob_size
-        "OCIO.Look",                                //tp_name
+        OCIO_PYTHON_NAMESPACE(Look),                //tp_name
         sizeof(PyOCIO_Look),                        //tp_basicsize
         0,                                          //tp_itemsize
         (destructor)PyOCIO_Look_delete,             //tp_dealloc

diff --git a/src/pyglue/PyLookTransform.cpp b/src/pyglue/PyLookTransform.cpp
@@ -81,7 +81,7 @@ OCIO_NAMESPACE_ENTER
 
     PyTypeObject PyOCIO_LookTransformType = {
         PyVarObject_HEAD_INIT(NULL, 0)              //ob_size
-        "OCIO.LookTransform",                       //tp_name
+        OCIO_PYTHON_NAMESPACE(LookTransform),       //tp_name
         sizeof(PyOCIO_Transform),                   //tp_basicsize
         0,                                          //tp_itemsize
         0,                                          //tp_dealloc

diff --git a/src/pyglue/PyMain.cpp b/src/pyglue/PyMain.cpp
@@ -153,14 +153,14 @@ OCIO_NAMESPACE_EXIT
 MOD_INIT(PyOpenColorIO)
 {
     PyObject * m;
-    MOD_DEF(m, "PyOpenColorIO", OCIO::OPENCOLORIO__DOC__, PyOCIO_methods);
+    MOD_DEF(m, OCIO_STRINGIFY(PYOCIO_NAME), OCIO::OPENCOLORIO__DOC__, PyOCIO_methods);
 
     PyModule_AddStringConstant(m, "version", OCIO::GetVersion());
     PyModule_AddIntConstant(m, "hexversion", OCIO::GetVersionHex());
 
     // Create Exceptions, and add to the module
-    char Exception[] = "PyOpenColorIO.Exception";
-    char ExceptionMissingFile[] = "PyOpenColorIO.ExceptionMissingFile";
+    char Exception[] = OCIO_PYTHON_NAMESPACE(Exception);
+    char ExceptionMissingFile[] = OCIO_PYTHON_NAMESPACE(ExceptionMissingFile);
 
 #if PY_MAJOR_VERSION >= 2 && PY_MINOR_VERSION >= 7
     OCIO::SetExceptionPyType(PyErr_NewExceptionWithDoc(Exception,

diff --git a/src/pyglue/PyMatrixTransform.cpp b/src/pyglue/PyMatrixTransform.cpp
@@ -100,7 +100,7 @@ OCIO_NAMESPACE_ENTER
 
     PyTypeObject PyOCIO_MatrixTransformType = {
         PyVarObject_HEAD_INIT(NULL, 0)
-        "OCIO.MatrixTransform",                     //tp_name
+        OCIO_PYTHON_NAMESPACE(MatrixTransform),     //tp_name
         sizeof(PyOCIO_Transform),                   //tp_basicsize
         0,                                          //tp_itemsize
         0,                                          //tp_dealloc

diff --git a/src/pyglue/PyProcessor.cpp b/src/pyglue/PyProcessor.cpp
@@ -110,7 +110,7 @@ OCIO_NAMESPACE_ENTER
 
     PyTypeObject PyOCIO_ProcessorType = {
         PyVarObject_HEAD_INIT(NULL, 0)              //ob_size
-        "OCIO.Processor",                           //tp_name
+        OCIO_PYTHON_NAMESPACE(Processor),           //tp_name
         sizeof(PyOCIO_Processor),                   //tp_basicsize
         0,                                          //tp_itemsize
         (destructor)PyOCIO_Processor_delete,        //tp_dealloc

diff --git a/src/pyglue/PyProcessorMetadata.cpp b/src/pyglue/PyProcessorMetadata.cpp
@@ -85,7 +85,7 @@ OCIO_NAMESPACE_ENTER
 
     PyTypeObject PyOCIO_ProcessorMetadataType = {
         PyVarObject_HEAD_INIT(NULL, 0)              //ob_size
-        "OCIO.ProcessorMetadata",                   //tp_name
+        OCIO_PYTHON_NAMESPACE(ProcessorMetadata),   //tp_name
         sizeof(PyOCIO_ProcessorMetadata),           //tp_basicsize
         0,                                          //tp_itemsize
         (destructor)PyOCIO_ProcessorMetadata_delete,//tp_dealloc

diff --git a/src/pyglue/PyTransform.cpp b/src/pyglue/PyTransform.cpp
@@ -212,7 +212,7 @@ OCIO_NAMESPACE_ENTER
 
     PyTypeObject PyOCIO_TransformType = {
         PyVarObject_HEAD_INIT(NULL, 0)              //ob_size
-        "OCIO.Transform",                           //tp_name
+        OCIO_PYTHON_NAMESPACE(Transform),           //tp_name
         sizeof(PyOCIO_Transform),                   //tp_basicsize
         0,                                          //tp_itemsize
         (destructor) PyOCIO_Transform_delete,       //tp_dealloc

diff --git a/src/pyglue/PyUtil.h b/src/pyglue/PyUtil.h
@@ -37,6 +37,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #define OCIO_PYTRY_ENTER() try {
 #define OCIO_PYTRY_EXIT(ret) } catch(...) { OCIO_NAMESPACE::Python_Handle_Exception(); return ret; }
+#define OCIO_STRINGIFY(str) OCIO_STRINGIFY_IMPL(str)
+#define OCIO_STRINGIFY_IMPL(str) #str
+#define OCIO_PYTHON_NAMESPACE(obj) OCIO_STRINGIFY(PYOCIO_NAME) "." #obj
 
 // Some utilities macros for python 2.5 to 3.3 compatibility
 #if PY_MAJOR_VERSION >= 3