patch the uncompress module to be able to deal with remote file
This commit is contained in:
@ -1,6 +1,7 @@
|
|||||||
#cython: language_level=3
|
#cython: language_level=3
|
||||||
|
|
||||||
cdef class MagicKeyFile:
|
cdef class MagicKeyFile:
|
||||||
|
cdef object stream
|
||||||
cdef str stream_mode
|
cdef str stream_mode
|
||||||
cdef object binary
|
cdef object binary
|
||||||
cdef bytes key
|
cdef bytes key
|
||||||
|
@ -15,17 +15,20 @@ import io
|
|||||||
cdef class MagicKeyFile:
|
cdef class MagicKeyFile:
|
||||||
def __init__(self,stream,length=2):
|
def __init__(self,stream,length=2):
|
||||||
|
|
||||||
|
binary=stream
|
||||||
|
self.stream = stream
|
||||||
self.stream_mode = None
|
self.stream_mode = None
|
||||||
if hasattr(stream, "mode"):
|
if hasattr(stream, "mode"):
|
||||||
self.stream_mode = stream.mode
|
self.stream_mode = stream.mode
|
||||||
if 'b' in stream.mode:
|
if (not 'b' in stream.mode and
|
||||||
binary=stream
|
hasattr(stream, "buffer") and
|
||||||
elif hasattr(stream, "buffer") and 'b' in stream.buffer.mode:
|
'b' in stream.buffer.mode):
|
||||||
binary=stream.buffer
|
binary=stream.buffer
|
||||||
else:
|
|
||||||
self.stream_mode = None
|
|
||||||
|
|
||||||
if self.stream_mode is None:
|
if (self.stream_mode is None and
|
||||||
|
not (hasattr(stream, 'headers') and
|
||||||
|
hasattr(stream.headers, "keys") and
|
||||||
|
'Content-type' in stream.headers)):
|
||||||
raise TypeError("stream does not present the good interface")
|
raise TypeError("stream does not present the good interface")
|
||||||
|
|
||||||
self.binary=binary
|
self.binary=binary
|
||||||
@ -95,8 +98,11 @@ cdef class CompressedFile:
|
|||||||
if self.accessor is None:
|
if self.accessor is None:
|
||||||
self.accessor = magic
|
self.accessor = magic
|
||||||
|
|
||||||
|
if ((hasattr(stream, 'headers') and
|
||||||
if 'b' not in magic.stream_mode:
|
hasattr(stream.headers, "keys") and
|
||||||
|
'Content-type' in stream.headers and
|
||||||
|
stream.headers['Content-type'].startswith('text/')) or
|
||||||
|
'b' not in magic.stream_mode):
|
||||||
self.accessor = io.TextIOWrapper(self.accessor)
|
self.accessor = io.TextIOWrapper(self.accessor)
|
||||||
|
|
||||||
|
|
||||||
@ -106,6 +112,3 @@ cdef class CompressedFile:
|
|||||||
def __iter__(self):
|
def __iter__(self):
|
||||||
for x in self.accessor:
|
for x in self.accessor:
|
||||||
yield x
|
yield x
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user