diff --git a/python/obitools3/files/uncompress.pxd b/python/obitools3/files/uncompress.pxd index 80c5b5d..e5064a3 100644 --- a/python/obitools3/files/uncompress.pxd +++ b/python/obitools3/files/uncompress.pxd @@ -9,6 +9,7 @@ cdef class MagicKeyFile: cdef int pos cpdef bytes read(self,int size=?) + cpdef bytes read1(self,int size=?) cpdef int tell(self) diff --git a/python/obitools3/files/uncompress.pyx b/python/obitools3/files/uncompress.pyx index ecd5d77..4a6a578 100644 --- a/python/obitools3/files/uncompress.pyx +++ b/python/obitools3/files/uncompress.pyx @@ -39,6 +39,9 @@ cdef class MagicKeyFile: cpdef bytes read(self,int size=-1): cdef bytes r + print(self.keylength) + print(size) + if self.pos < self.keylength: if size > (self.keylength - self.pos): size = size - self.keylength + self.pos @@ -54,14 +57,17 @@ cdef class MagicKeyFile: r = self.binary.read(size) return r - + + cpdef bytes read1(self,int size=-1): + return self.read(size) + cpdef int tell(self): cdef int p if self.pos < self.keylength: p = self.pos else: - p = self.tell() + p = self.binary.tell() return p