diff --git a/setup.py b/setup.py index 2f4746f0..003265ae 100755 --- a/setup.py +++ b/setup.py @@ -83,6 +83,6 @@ def find_version(*file_paths): cmdclass=cmdclass, command_options=command_options, install_requires=[ - 'msgpack>=0.4.0', + 'msgpack>=1.0.0', ] ) diff --git a/tarantool/request.py b/tarantool/request.py index d1a5a829..4d7a1358 100644 --- a/tarantool/request.py +++ b/tarantool/request.py @@ -76,31 +76,7 @@ def __init__(self, conn): self._sync = None self._body = '' self.response_class = Response - - packer_kwargs = dict() - - # use_bin_type=True is default since msgpack-1.0.0. - # - # The option controls whether to pack binary (non-unicode) - # string values as mp_bin or as mp_str. - # - # The default behaviour of the connector is to pack both - # bytes and Unicode strings as mp_str. - # - # msgpack-0.5.0 (and only this version) warns when the - # option is unset: - # - # | FutureWarning: use_bin_type option is not specified. - # | Default value of the option will be changed in future - # | version. - # - # The option is supported since msgpack-0.4.0, so we can - # just always set it for all msgpack versions to get rid - # of the warning on msgpack-0.5.0 and to keep our - # behaviour on msgpack-1.0.0. - packer_kwargs['use_bin_type'] = False - - self.packer = msgpack.Packer(**packer_kwargs) + self.packer = msgpack.Packer() def _dumps(self, src): return self.packer.pack(src)