From 8a1f84464521a38c76539038b7d2d389c1f60848 Mon Sep 17 00:00:00 2001 From: Celine Mercier Date: Thu, 21 Sep 2023 17:47:40 +1200 Subject: [PATCH] obi import: fixed bug caused by new behaviour of StopIteration exceptions in Python>=3.7 --- python/obitools3/parsers/fastq.pyx | 12 +++++++++--- python/obitools3/parsers/tab.pyx | 5 ++++- python/obitools3/version.py | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/python/obitools3/parsers/fastq.pyx b/python/obitools3/parsers/fastq.pyx index df0a278..735ece0 100755 --- a/python/obitools3/parsers/fastq.pyx +++ b/python/obitools3/parsers/fastq.pyx @@ -103,7 +103,11 @@ def fastqWithQualityIterator(lineiterator, yield seq read+=1 - hline = next(i) + try: + hline = next(i) + except StopIteration: + return + def fastqWithoutQualityIterator(lineiterator, @@ -174,5 +178,7 @@ def fastqWithoutQualityIterator(lineiterator, yield seq read+=1 - hline = next(i) - + try: + hline = next(i) + except StopIteration: + return diff --git a/python/obitools3/parsers/tab.pyx b/python/obitools3/parsers/tab.pyx index 1a1c9c8..3964189 100755 --- a/python/obitools3/parsers/tab.pyx +++ b/python/obitools3/parsers/tab.pyx @@ -99,7 +99,10 @@ def tabIterator(lineiterator, read+=1 - line = next(iterator) + try: + line = next(iterator) + except StopIteration: + return \ No newline at end of file diff --git a/python/obitools3/version.py b/python/obitools3/version.py index 2e35bb5..7f93f41 100755 --- a/python/obitools3/version.py +++ b/python/obitools3/version.py @@ -1,5 +1,5 @@ major = 3 minor = 0 -serial= '1b24' +serial= '1b25' version ="%d.%d.%s" % (major,minor,serial)