summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorINADA Naoki <methane@users.noreply.github.com>2018-01-05 20:19:04 +0900
committerGitHub <noreply@github.com>2018-01-05 20:19:04 +0900
commit43137d6bd2cc841af775a9c8132e72d284b119e3 (patch)
treeb0362f7d5963785358cb1a352ccb06ca2b6bede8
parent0e2021d3a3d1218ca191f4e802df0af3bbfaa51f (diff)
downloadmsgpack-python-43137d6bd2cc841af775a9c8132e72d284b119e3.tar.gz
Deprecate write_bytes option in Unpacker. (#262)
Fixes #197
-rw-r--r--msgpack/_unpacker.pyx3
-rw-r--r--msgpack/fallback.py4
2 files changed, 7 insertions, 0 deletions
diff --git a/msgpack/_unpacker.pyx b/msgpack/_unpacker.pyx
index dabc5f7..564749e 100644
--- a/msgpack/_unpacker.pyx
+++ b/msgpack/_unpacker.pyx
@@ -458,6 +458,9 @@ cdef class Unpacker(object):
cdef object obj
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:
self.read_from_file()
diff --git a/msgpack/fallback.py b/msgpack/fallback.py
index 28478ca..3c9c3b8 100644
--- a/msgpack/fallback.py
+++ b/msgpack/fallback.py
@@ -609,12 +609,14 @@ class Unpacker(object):
def skip(self, write_bytes=None):
self._unpack(EX_SKIP)
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])
self._consume()
def unpack(self, write_bytes=None):
ret = self._unpack(EX_CONSTRUCT)
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])
self._consume()
return ret
@@ -622,6 +624,7 @@ class Unpacker(object):
def read_array_header(self, write_bytes=None):
ret = self._unpack(EX_READ_ARRAY_HEADER)
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])
self._consume()
return ret
@@ -629,6 +632,7 @@ class Unpacker(object):
def read_map_header(self, write_bytes=None):
ret = self._unpack(EX_READ_MAP_HEADER)
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])
self._consume()
return ret