diff --git a/python/obitools3/obidms/capidms.cfiles b/python/obitools3/obidms/capidms.cfiles index f36381c..d4f6611 100644 --- a/python/obitools3/obidms/capidms.cfiles +++ b/python/obitools3/obidms/capidms.cfiles @@ -6,4 +6,5 @@ ../../../src/obilittlebigman.c ../../../src/obitypes.h ../../../src/obitypes.c - +../../../src/private_openat.h +../../../src/private_openat.c diff --git a/python/obitools3/obidms/capidms.pxd b/python/obitools3/obidms/capidms.pxd index b497243..494b2ce 100644 --- a/python/obitools3/obidms/capidms.pxd +++ b/python/obitools3/obidms/capidms.pxd @@ -1,6 +1,15 @@ cdef extern from *: ctypedef char* const_char_p "const char*" + +## Put somewhere else probably +cdef extern from "obitypes.h" nogil: + enum OBIType: + pass + + ctypedef OBIType OBIType_t + + cdef extern from "obidms.h" nogil: struct OBIDMS_t: pass @@ -15,5 +24,6 @@ cdef extern from "obidms.h" nogil: int obi_close_dms(OBIDMS_p dms) + cdef class OBIDMS: cdef OBIDMS_p pointer diff --git a/python/obitools3/obidms/capidms.pyx b/python/obitools3/obidms/capidms.pyx index 18b3796..d9dea61 100644 --- a/python/obitools3/obidms/capidms.pyx +++ b/python/obitools3/obidms/capidms.pyx @@ -4,8 +4,8 @@ from .capidms cimport * cdef class OBIDMS: - def __init__(self,name): - self.pointer = obi_dms(name) + def __init__(self, dms_name): + self.pointer = obi_dms(dms_name) def __del__(self): - obi_close_dms(self.pointer) \ No newline at end of file + obi_close_dms(self.pointer)