Stowage/msgpack-python
2
0
Fork 0
mirror of https://github.com/msgpack/msgpack-python.git synced 2025-11-09 22:11:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Deprecate write_bytes option in Unpacker. (#262)

Browse source 
Fixes #197
This commit is contained in:
INADA Naoki 2018-01-05 20:19:04 +09:00 • committed by GitHub
parent 0e2021d3a3
commit 43137d6bd2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
msgpack/_unpacker.pyx
View file

@ -458,6 +458,9 @@ cdef class Unpacker(object):
cdef object obj cdef object obj
cdef Py_ssize_t prev_head cdef Py_ssize_t prev_head
if write_bytes is not None:
PyErr_WarnEx(DeprecationWarning, "`write_bytes` option is deprecated. Use `.tell()` instead.", 1)
if self.buf_head >= self.buf_tail and self.file_like is not None: if self.buf_head >= self.buf_tail and self.file_like is not None:
self.read_from_file() self.read_from_file()

4
msgpack/fallback.py
View file

@ -609,12 +609,14 @@ class Unpacker(object):
def skip(self, write_bytes=None): def skip(self, write_bytes=None):
self._unpack(EX_SKIP) self._unpack(EX_SKIP)
if write_bytes is not None: if write_bytes is not None:
warnings.warn("`write_bytes` option is deprecated. Use `.tell()` instead.", DeprecationWarning)
write_bytes(self._buffer[self._buf_checkpoint:self._buff_i]) write_bytes(self._buffer[self._buf_checkpoint:self._buff_i])
self._consume() self._consume()
def unpack(self, write_bytes=None): def unpack(self, write_bytes=None):
ret = self._unpack(EX_CONSTRUCT) ret = self._unpack(EX_CONSTRUCT)
if write_bytes is not None: if write_bytes is not None:
warnings.warn("`write_bytes` option is deprecated. Use `.tell()` instead.", DeprecationWarning)
write_bytes(self._buffer[self._buf_checkpoint:self._buff_i]) write_bytes(self._buffer[self._buf_checkpoint:self._buff_i])
self._consume() self._consume()
return ret return ret
@ -622,6 +624,7 @@ class Unpacker(object):
def read_array_header(self, write_bytes=None): def read_array_header(self, write_bytes=None):
ret = self._unpack(EX_READ_ARRAY_HEADER) ret = self._unpack(EX_READ_ARRAY_HEADER)
if write_bytes is not None: if write_bytes is not None:
warnings.warn("`write_bytes` option is deprecated. Use `.tell()` instead.", DeprecationWarning)
write_bytes(self._buffer[self._buf_checkpoint:self._buff_i]) write_bytes(self._buffer[self._buf_checkpoint:self._buff_i])
self._consume() self._consume()
return ret return ret
@ -629,6 +632,7 @@ class Unpacker(object):
def read_map_header(self, write_bytes=None): def read_map_header(self, write_bytes=None):
ret = self._unpack(EX_READ_MAP_HEADER) ret = self._unpack(EX_READ_MAP_HEADER)
if write_bytes is not None: if write_bytes is not None:
warnings.warn("`write_bytes` option is deprecated. Use `.tell()` instead.", DeprecationWarning)
write_bytes(self._buffer[self._buf_checkpoint:self._buff_i]) write_bytes(self._buffer[self._buf_checkpoint:self._buff_i])
self._consume() self._consume()
return ret return ret