Changeset 952ea1f in sasview for src/sas/sascalc/file_converter

Timestamp:

Oct 11, 2018 1:33:22 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249

Children:

7ba6470

Parents:

67ed543

git-author:

Paul Kienzle <pkienzle@…> (10/11/18 13:22:07)

git-committer:

Paul Kienzle <pkienzle@…> (10/11/18 13:33:22)

Message:

move c extensions from core/module.so to _module.so

Location:

src/sas/sascalc/file_converter

Files:

• bsl_loader.py (modified) (2 diffs)
• c_ext/__init__.py (deleted)
• c_ext/bsl_loader.c (modified) (2 diffs)

src/sas/sascalc/file_converter/bsl_loader.py

@@ -1 @@
-from sas.sascalc.file_converter.core.bsl_loader import CLoader
+from sas.sascalc.file_converter._bsl_loader import CLoader
 from sas.sascalc.dataloader.data_info import Data2D
 from copy import deepcopy
@@ -67 +67 @@
                     'swap_bytes': int(metadata[3])
                 }
-            except:
+            except Exception:
                 is_valid = False
                 err_msg = "Invalid metadata in header file for {}"

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

@@ +1 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+//#define Py_LIMITED_API 0x03020000
 #include <Python.h>
+#include <structmember.h>
 #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
 #include <numpy/arrayobject.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "structmember.h"
+
 #include "bsl_loader.h"
 
@@ -292 +295 @@
 
 #define MODULE_DOC "C module for loading bsl."
-#define MODULE_NAME "bsl_loader"
-#define MODULE_INIT2 initbsl_loader
-#define MODULE_INIT3 PyInit_bsl_loader
+#define MODULE_NAME "_bsl_loader"
+#define MODULE_INIT2 init_bsl_loader
+#define MODULE_INIT3 PyInit__bsl_loader
 #define MODULE_METHODS module_methods