Bio.SeqIO.index() refactor (manual merge from branch)

biopython · Jan 1, 2011 · c7b409e · c7b409e
1 parent 197390e
commit c7b409e
Show file tree

Hide file tree

Showing 3 changed files with 242 additions and 175 deletions.
diff --git a/Bio/SeqIO/__init__.py b/Bio/SeqIO/__init__.py
@@ -775,11 +775,7 @@ def index(filename, format, alphabet=None, key_function=None):
 
     #Map the file format to a sequence iterator:    
     import _index #Lazy import
-    try:
-        indexer = _index._FormatToIndexedDict[format]
-    except KeyError:
-        raise ValueError("Unsupported format '%s'" % format)
-    return indexer(filename, format, alphabet, key_function)
+    return _index._IndexedSeqFileDict(filename, format, alphabet, key_function)
 
 def to_alignment(sequences, alphabet=None, strict=True):
     """Returns a multiple sequence alignment (DEPRECATED).