obi import: fixed bug caused by new behaviour of StopIteration

exceptions in Python>=3.7
2023-09-21 17:47:40 +12:00
parent 791ccfb92e
commit 8a1f844645
3 changed files with 14 additions and 5 deletions
--- 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        
--- 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 
    
        
        
--- 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)