Update the p7_hmmfile API for opening HMM files

althonos · Aug 16, 2023 · 0f92f32 · 0f92f32
1 parent a712fd6
commit 0f92f32
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/include/libhmmer/p7_hmmfile.pxd b/include/libhmmer/p7_hmmfile.pxd
@@ -45,10 +45,8 @@ cdef extern from "hmmer.h" nogil:
         char[eslERRBUFSIZE] errbuf
 
 
-    int  p7_hmmfile_OpenE    (const char *filename, char *env, P7_HMMFILE **ret_hfp, char *errbuf) except *
-    int  p7_hmmfile_OpenENoDB(const char *filename, char *env, P7_HMMFILE **ret_hfp, char *errbuf) except *
-    int  p7_hmmfile_Open     (const char *filename, char *env, P7_HMMFILE **ret_hfp) except * # Deprecated
-    int  p7_hmmfile_OpenNoDB (const char *filename, char *env, P7_HMMFILE **ret_hfp) except * # Deprecated
+    int  p7_hmmfile_Open     (const char *filename, char *env, P7_HMMFILE **ret_hfp, char *errbuf) except *
+    int  p7_hmmfile_OpenNoDB (const char *filename, char *env, P7_HMMFILE **ret_hfp, char *errbuf) except *
     int  p7_hmmfile_OpenBuffer(const char *buffer, int size, P7_HMMFILE **ret_hfp) except *
     void p7_hmmfile_Close(P7_HMMFILE *hfp) except *
 

diff --git a/pyhmmer/plan7.pyx b/pyhmmer/plan7.pyx
@@ -3442,10 +3442,10 @@ cdef class HMMFile:
             self._name = os.fsdecode(fspath)
             if db:
                 function = "p7_hmmfile_OpenE"
-                status = libhmmer.p7_hmmfile.p7_hmmfile_OpenE(fspath, NULL, &self._hfp, errbuf)
+                status = libhmmer.p7_hmmfile.p7_hmmfile_Open(fspath, NULL, &self._hfp, errbuf)
             else:
                 function = "p7_hmmfile_OpenENoDB"
-                status = libhmmer.p7_hmmfile.p7_hmmfile_OpenENoDB(fspath, NULL, &self._hfp, errbuf)
+                status = libhmmer.p7_hmmfile.p7_hmmfile_OpenNoDB(fspath, NULL, &self._hfp, errbuf)
         except TypeError:
             self._hfp = HMMFile._open_fileobj(file)
             status    = libeasel.eslOK