Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rename consume to consume_string #1589

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

rename consume to consume_string #1589

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions khmer/_khmer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1624,7 +1624,7 @@ hashtable_consume_fasta_with_reads_parser(khmer_KHashtable_Object * me,

static
PyObject *
hashtable_consume(khmer_KHashtable_Object * me, PyObject * args)
hashtable_consume_string(khmer_KHashtable_Object * me, PyObject * args)
{
Hashtable * hashtable = me->hashtable;

Expand Down Expand Up @@ -2223,8 +2223,8 @@ static PyMethodDef khmer_hashtable_methods[] = {
"Increment the count of this k-mer. (Synonym for 'count'.)"
},
{
"consume",
(PyCFunction)hashtable_consume, METH_VARARGS,
"consume_string",
(PyCFunction)hashtable_consume_string, METH_VARARGS,
"Increment the counts of all of the k-mers in the string."
},
{
Expand Down Expand Up @@ -4460,7 +4460,7 @@ junctioncountassembler_assemble(khmer_KJunctionCountAssembler_Object * me,

static
PyObject *
junctioncountassembler_consume(khmer_KJunctionCountAssembler_Object * me,
junctioncountassembler_consume_string(khmer_KJunctionCountAssembler_Object * me,
PyObject * args)
{
JunctionCountAssembler * assembler = me->assembler;
Expand All @@ -4476,7 +4476,7 @@ junctioncountassembler_consume(khmer_KJunctionCountAssembler_Object * me,
return NULL;
}

uint16_t n_junctions = assembler->consume(long_str);
uint16_t n_junctions = assembler->consume_string(long_str);

return PyLong_FromLong((HashIntoType) n_junctions);
}
Expand All @@ -4489,8 +4489,8 @@ static PyMethodDef khmer_junctioncountassembler_methods[] = {
"Assemble paths, using recorded junctions to jump branches."
},
{
"consume",
(PyCFunction)junctioncountassembler_consume, METH_VARARGS,
"consume_string",
(PyCFunction)junctioncountassembler_consume_string, METH_VARARGS,
"Consume a string and count its branch junctions."
},
{NULL, NULL, 0, NULL} /* sentinel */
Expand Down