obitools/obitools3
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 66 Wiki Activity

Updated deprecated code in cython API for columns (using line count of

Browse Source 
view instead of column)
This commit is contained in:
Celine Mercier
2016-12-16 19:04:21 +01:00
parent 191c83aafc
commit 490f5fe6b9
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
python/obitools3/obidms/_obidms.pyx
View File

@ -100,17 +100,17 @@ cdef class OBIDMS_column :
def __getitem__(self, index_t line_nb): def __getitem__(self, index_t line_nb):
return self.get_line(line_nb) return self.get_line(line_nb)
def __len__(self): def __len__(self): # TODO discuss
return self.lines_used return self._view.line_count
def __sizeof__(self): def __sizeof__(self):
return ((self._pointer)[0].header.header_size + (self._pointer)[0].header.data_size) return ((self._pointer)[0].header.header_size + (self._pointer)[0].header.data_size)
def __iter__(self): def __iter__(self): # TODO discuss
# Declarations # Declarations
cdef index_t line_nb cdef index_t line_nb
# Yield each line # Yield each line
for line_nb in range(self.lines_used): for line_nb in range(self._view.line_count):
yield self.get_line(line_nb) yield self.get_line(line_nb)
def __str__(self) : def __str__(self) :
@ -160,11 +160,6 @@ cdef class OBIDMS_column :
def version(self): def version(self):
return ((self._pointer)[0].header).version return ((self._pointer)[0].header).version
# lines_used property getter
@property
def lines_used(self):
return (self._pointer)[0].header.lines_used
# comments property getter # comments property getter
@property @property
def comments(self): def comments(self):