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

Deleted some redundant cython code

Browse Source
This commit is contained in:
Celine Mercier
2016-06-10 10:34:47 +02:00
parent f438c3d913
commit 38e603ed57
1 changed files with 3 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -314,7 +314,7 @@ cdef class OBIView :
cpdef delete_column(self, str column_name) : cpdef delete_column(self, str column_name) :
cdef int i cdef int i
cdef Obiview_p view cdef Obiview_p view_p
cdef OBIDMS_column column cdef OBIDMS_column column
cdef OBIDMS_column_p column_p cdef OBIDMS_column_p column_p
cdef OBIDMS_column_header_p header cdef OBIDMS_column_header_p header
@ -322,7 +322,7 @@ cdef class OBIView :
view = self.pointer view = self.pointer
if obi_view_delete_column(view, str2bytes(column_name)) < 0 : if obi_view_delete_column(view_p, str2bytes(column_name)) < 0 :
raise Exception("Problem deleting a column from a view") raise Exception("Problem deleting a column from a view")
# Update the dictionaries of column pointers and column objects, and update pointers in column objects (make function?): # Update the dictionaries of column pointers and column objects, and update pointers in column objects (make function?):
@ -330,7 +330,7 @@ cdef class OBIView :
for column_n in self.columns : for column_n in self.columns :
(self.columns[column_n]).update_pointer() (self.columns[column_n]).update_pointer()
cpdef add_column(self, cpdef add_column(self,
str column_name, str column_name,
@ -502,28 +502,6 @@ cdef class OBIView_NUC_SEQS(OBIView):
self.sequences = self.columns[bytes2str(NUC_SEQUENCE_COLUMN)] self.sequences = self.columns[bytes2str(NUC_SEQUENCE_COLUMN)]
self.definitions = self.columns[bytes2str(DEFINITION_COLUMN)] self.definitions = self.columns[bytes2str(DEFINITION_COLUMN)]
self.qualities = self.columns[bytes2str(QUALITY_COLUMN)] self.qualities = self.columns[bytes2str(QUALITY_COLUMN)]
cpdef delete_column(self, str column_name) :
cdef int i
cdef Obiview_p view_p
cdef OBIDMS_column column
cdef OBIDMS_column_p column_p
cdef OBIDMS_column_header_p header
cdef str column_n
view_p = self.pointer
if obi_view_delete_column(view_p, str2bytes(column_name)) < 0 :
raise Exception("Problem deleting a column from a view")
# Remove instance from the dictionary
(self.columns).pop(column_name)
for column_n in self.columns :
(self.columns[column_n]).update_pointer()
def __getitem__(self, object item) : def __getitem__(self, object item) :
if type(item) == str : if type(item) == str :
@ -531,7 +509,6 @@ cdef class OBIView_NUC_SEQS(OBIView):
elif type(item) == int : elif type(item) == int :
return OBI_Nuc_Seq_Stored(self, item) return OBI_Nuc_Seq_Stored(self, item)
def __setitem__(self, index_t line_idx, OBI_Nuc_Seq sequence_obj) : def __setitem__(self, index_t line_idx, OBI_Nuc_Seq sequence_obj) :
for key in sequence_obj : for key in sequence_obj :
self[line_idx][key] = sequence_obj[key] self[line_idx][key] = sequence_obj[key]