From 6b9da38087f96fa2d81d5e27f8d9033423a0939c Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Fri, 29 Mar 2019 15:19:44 +0100 Subject: [PATCH] patch some relative imports --- python/obitools3/dms/column/column_idx.pxd | 3 ++- python/obitools3/dms/taxo/taxo.pxd | 5 +++-- python/obitools3/dms/taxo/taxo.pyx | 3 +-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/python/obitools3/dms/column/column_idx.pxd b/python/obitools3/dms/column/column_idx.pxd index e5248ee..2e2c63e 100755 --- a/python/obitools3/dms/column/column_idx.pxd +++ b/python/obitools3/dms/column/column_idx.pxd @@ -2,7 +2,8 @@ from obitools3.dms.capi.obitypes cimport index_t -from obitools3.dms.column.column cimport Column +from obitools3.dms.column.column cimport Column, \ + Column_multi_elts cdef class Column_idx(Column) : diff --git a/python/obitools3/dms/taxo/taxo.pxd b/python/obitools3/dms/taxo/taxo.pxd index a9a1284..e885897 100755 --- a/python/obitools3/dms/taxo/taxo.pxd +++ b/python/obitools3/dms/taxo/taxo.pxd @@ -1,4 +1,4 @@ -#cython: language_level=3 +# cython: language_level=3 from obitools3.dms.capi.obitaxonomy cimport ecotx_t, OBIDMS_taxonomy_p @@ -28,4 +28,5 @@ cdef class Taxonomy(OBIWrapper) : cdef class Taxon : cdef ecotx_t* _pointer - cdef Taxonomy _tax \ No newline at end of file + cdef Taxonomy _tax + \ No newline at end of file diff --git a/python/obitools3/dms/taxo/taxo.pyx b/python/obitools3/dms/taxo/taxo.pyx index 7a70551..2ff403b 100755 --- a/python/obitools3/dms/taxo/taxo.pyx +++ b/python/obitools3/dms/taxo/taxo.pyx @@ -4,7 +4,6 @@ from obitools3.utils cimport str2bytes, bytes2str, tobytes, tostr from obitools3.dms.capi.obitaxonomy cimport ecotx_t, OBIDMS_taxonomy_p from obitools3.dms.dms cimport DMS -from obitools3.dms.dms import DMS from obitools3.dms.object cimport OBIWrapper @@ -321,7 +320,7 @@ cdef class Taxonomy(OBIWrapper) : cdef class Taxon : # TODO dict subclass? def __init__(self, object taxon_capsule, Taxonomy tax) : - self._pointer = PyCapsule_GetPointer(taxon_capsule, NULL) + self._pointer = PyCapsule_GetPointer(taxon_capsule, NULL) if self._pointer == NULL : raise Exception("Error reading a taxon (NULL pointer)") self._tax = tax