Goes with previous commit

This commit is contained in:
Celine Mercier
2017-07-27 19:43:00 +02:00
parent 7112f44fb7
commit 89e2f80fd8

View File

@ -1,7 +1,10 @@
#cython: language_level=3
import re import re
from obitools3.parsers.fasta import fastaNucIterator from obitools3.parsers.fasta import fastaNucIterator
from obitools3.parsers.fastq import fastqIterator from obitools3.parsers.fastq import fastqIterator
oligore = re.compile("^[ACGTRYSWKMBDHVN]+$",re.I) oligore = re.compile("^[ACGTRYSWKMBDHVN]+$",re.I)
tagre = re.compile("^([ACGTRYSWKMBDHVN]+|-)(:([ACGTRYSWKMBDHVN]+)|-)?$",re.I) tagre = re.compile("^([ACGTRYSWKMBDHVN]+|-)(:([ACGTRYSWKMBDHVN]+)|-)?$",re.I)
@ -21,14 +24,14 @@ def entryIteratorFactory(lineiterator,
only=None, only=None,
bytes seqtype=b'nuc', bytes seqtype=b'nuc',
int qualityoffset=32, int qualityoffset=32,
bool noquality=False, bint noquality=False,
bool skiperror=True, bint skiperror=True,
bool header=False, bint header=False,
bytes sep=None, bytes sep=None,
bytes dec=b'.', bytes dec=b'.',
bytes nastring=b"NA", bytes nastring=b"NA",
bool stripwhite=True, bint stripwhite=True,
bool blanklineskip=True, bint blanklineskip=True,
bytes commentchar=b"#", bytes commentchar=b"#",
int buffersize=100000000): int buffersize=100000000):
@ -70,7 +73,7 @@ def entryIteratorFactory(lineiterator,
Nuc_Seq) Nuc_Seq)
else: else:
raise NotImplementedError() raise NotImplementedError()
elif format=b'fastq': elif format==b'fastq':
return (fastqIterator(lineiterator, return (fastqIterator(lineiterator,
skip,only, skip,only,
qualityoffset, qualityoffset,