Changeset d5aeaa3 in sasview for src/sas/sascalc/file_converter

Timestamp:

Sep 26, 2017 10:36:53 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

0225a3f

Parents:

f542866

Message:

add CLoader to the correct module

File:

• src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified) (4 diffs)

src/sas/sascalc/file_converter/c_ext/bsl_loader.c

@@ -279 +279 @@
 };
 
-static PyMethodDef module_methods[] = {
-    {NULL}
-};
-
 /**
  * Function used to add the model class to a module
  * @param module: module to add the class to
  */
-void addCLoader(PyObject *module) {
+void addCLoader(PyObject *module)
+{
     if (PyType_Ready(&CLoaderType) < 0)
         return;
-
     Py_INCREF(&CLoaderType);
-    PyModule_AddObject(module, "bsl_loader", (PyObject *)&CLoaderType);
-}
-
+    PyModule_AddObject(module, "CLoader", (PyObject *)&CLoaderType);
+}
 
 #define MODULE_DOC "C module for loading bsl."
@@ -312 +307 @@
 
 #if PY_MAJOR_VERSION >= 3
+
+  static PyMethodDef module_methods[] = {
+      {NULL}
+  };
 
   DLL_EXPORT PyMODINIT_FUNC MODULE_INIT3(void)
@@ -326 +325 @@
       NULL,                /* m_free */
     };
-        PyObject* m = PyModule_Create(&moduledef);
-        addCLoader(m);
-        return m;
+    PyObject* m = PyModule_Create(&moduledef);
+    import_array();
+    addCLoader(m);
+    return m;
   }
 
@@ -335 +335 @@
   DLL_EXPORT PyMODINIT_FUNC MODULE_INIT2(void)
   {
-    PyObject* m = Py_InitModule4(MODULE_NAME,
-                 MODULE_METHODS,
-                 MODULE_DOC,
-                 0,
-                 PYTHON_API_VERSION
-                 );
-        addCLoader(m);
+    PyObject* m = Py_InitModule(MODULE_NAME, NULL);
+    import_array();
+    addCLoader(m);
   }