From 54c91ee9b27956a257ac5459ff5ec31c1d9efb72 Mon Sep 17 00:00:00 2001
From: Evgeny Markov <evgenymarkov@yandex.com>
Date: Tue, 23 May 2023 01:23:25 +0200
Subject: [PATCH 1/6] Update black to latest version
---
Makefile | 4 +++-
msgpack/ext.py | 16 ++++------------
msgpack/fallback.py | 25 +++++++------------------
pyproject.toml | 5 +++++
requirements.txt | 6 +++---
setup.py | 6 +-----
test/test_extension.py | 4 +---
test/test_format.py | 4 +---
test/test_pack.py | 4 +---
test/test_stricttype.py | 4 +---
10 files changed, 27 insertions(+), 51 deletions(-)
diff --git a/Makefile b/Makefile
index 415dcfdd..30526928 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,12 @@
+PYTHON_SOURCES = msgpack test setup.py
+
.PHONY: all
all: cython
python setup.py build_ext -i -f
.PHONY: black
black:
- black -S msgpack/ test/ setup.py
+ black $(PYTHON_SOURCES)
.PHONY: cython
cython:
diff --git a/msgpack/ext.py b/msgpack/ext.py
index 07f96a58..a724a87f 100644
--- a/msgpack/ext.py
+++ b/msgpack/ext.py
@@ -47,24 +47,18 @@ def __init__(self, seconds, nanoseconds=0):
if not isinstance(nanoseconds, int):
raise TypeError("nanoseconds must be an integer")
if not (0 <= nanoseconds < 10**9):
- raise ValueError(
- "nanoseconds must be a non-negative integer less than 999999999."
- )
+ raise ValueError("nanoseconds must be a non-negative integer less than 999999999.")
self.seconds = seconds
self.nanoseconds = nanoseconds
def __repr__(self):
"""String representation of Timestamp."""
- return "Timestamp(seconds={0}, nanoseconds={1})".format(
- self.seconds, self.nanoseconds
- )
+ return "Timestamp(seconds={0}, nanoseconds={1})".format(self.seconds, self.nanoseconds)
def __eq__(self, other):
"""Check for equality with another Timestamp object"""
if type(other) is self.__class__:
- return (
- self.seconds == other.seconds and self.nanoseconds == other.nanoseconds
- )
+ return self.seconds == other.seconds and self.nanoseconds == other.nanoseconds
return False
def __ne__(self, other):
@@ -164,9 +158,7 @@ def to_datetime(self):
:rtype: datetime.
"""
utc = datetime.timezone.utc
- return datetime.datetime.fromtimestamp(0, utc) + datetime.timedelta(
- seconds=self.to_unix()
- )
+ return datetime.datetime.fromtimestamp(0, utc) + datetime.timedelta(seconds=self.to_unix())
@staticmethod
def from_datetime(dt):
diff --git a/msgpack/fallback.py b/msgpack/fallback.py
index 618c3622..412aee65 100644
--- a/msgpack/fallback.py
+++ b/msgpack/fallback.py
@@ -334,9 +334,7 @@ def __init__(
if object_pairs_hook is not None and not callable(object_pairs_hook):
raise TypeError("`object_pairs_hook` is not callable")
if object_hook is not None and object_pairs_hook is not None:
- raise TypeError(
- "object_pairs_hook and object_hook are mutually " "exclusive"
- )
+ raise TypeError("object_pairs_hook and object_hook are mutually " "exclusive")
if not callable(ext_hook):
raise TypeError("`ext_hook` is not callable")
@@ -434,9 +432,7 @@ def _read_header(self):
n = b & 0b00001111
typ = TYPE_ARRAY
if n > self._max_array_len:
- raise ValueError(
- "%s exceeds max_array_len(%s)" % (n, self._max_array_len)
- )
+ raise ValueError("%s exceeds max_array_len(%s)" % (n, self._max_array_len))
elif b & 0b11110000 == 0b10000000:
n = b & 0b00001111
typ = TYPE_MAP
@@ -478,9 +474,7 @@ def _read_header(self):
elif 0xD4 <= b <= 0xD8:
size, fmt, typ = _MSGPACK_HEADERS[b]
if self._max_ext_len < size:
- raise ValueError(
- "%s exceeds max_ext_len(%s)" % (size, self._max_ext_len)
- )
+ raise ValueError("%s exceeds max_ext_len(%s)" % (size, self._max_ext_len))
self._reserve(size + 1)
n, obj = struct.unpack_from(fmt, self._buffer, self._buff_i)
self._buff_i += size + 1
@@ -501,9 +495,7 @@ def _read_header(self):
(n,) = struct.unpack_from(fmt, self._buffer, self._buff_i)
self._buff_i += size
if n > self._max_array_len:
- raise ValueError(
- "%s exceeds max_array_len(%s)" % (n, self._max_array_len)
- )
+ raise ValueError("%s exceeds max_array_len(%s)" % (n, self._max_array_len))
elif 0xDE <= b <= 0xDF:
size, fmt, typ = _MSGPACK_HEADERS[b]
self._reserve(size)
@@ -549,17 +541,14 @@ def _unpack(self, execute=EX_CONSTRUCT):
return
if self._object_pairs_hook is not None:
ret = self._object_pairs_hook(
- (self._unpack(EX_CONSTRUCT), self._unpack(EX_CONSTRUCT))
- for _ in range(n)
+ (self._unpack(EX_CONSTRUCT), self._unpack(EX_CONSTRUCT)) for _ in range(n)
)
else:
ret = {}
for _ in range(n):
key = self._unpack(EX_CONSTRUCT)
if self._strict_map_key and type(key) not in (str, bytes):
- raise ValueError(
- "%s is not allowed for map key" % str(type(key))
- )
+ raise ValueError("%s is not allowed for map key" % str(type(key)))
if type(key) is str:
key = sys.intern(key)
ret[key] = self._unpack(EX_CONSTRUCT)
@@ -933,7 +922,7 @@ def _pack_map_header(self, n):
def _pack_map_pairs(self, n, pairs, nest_limit=DEFAULT_RECURSE_LIMIT):
self._pack_map_header(n)
- for (k, v) in pairs:
+ for k, v in pairs:
self._pack(k, nest_limit - 1)
self._pack(v, nest_limit - 1)
diff --git a/pyproject.toml b/pyproject.toml
index 195795f0..86fae1c7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,3 +6,8 @@ requires = [
"setuptools >= 35.0.2",
]
build-backend = "setuptools.build_meta"
+
+[tool.black]
+line-length = 100
+target-version = ["py37"]
+skip_string_normalization = true
diff --git a/requirements.txt b/requirements.txt
index 9f3c1a0d..efc532c3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
-# Also declared in pyproject.toml, if updating here please also update there
+# Also declared in pyproject.toml, if updating here please also update there.
Cython~=0.29.30
-# dev only tools. no need to add pyproject
-black==22.3.0
+# Tools required only for development. No need to add it to pyproject.toml file.
+black==23.3.0
diff --git a/setup.py b/setup.py
index 15ba7741..3f93a984 100755
--- a/setup.py
+++ b/setup.py
@@ -36,11 +36,7 @@ def ensure_source(src):
if not have_cython:
raise NoCython
cythonize(pyx)
- elif (
- os.path.exists(pyx)
- and os.stat(src).st_mtime < os.stat(pyx).st_mtime
- and have_cython
- ):
+ elif os.path.exists(pyx) and os.stat(src).st_mtime < os.stat(pyx).st_mtime and have_cython:
cythonize(pyx)
return src
diff --git a/test/test_extension.py b/test/test_extension.py
index dfbe4350..7adefc47 100644
--- a/test/test_extension.py
+++ b/test/test_extension.py
@@ -17,9 +17,7 @@ def p(s):
assert p(b"A" * 16) == b"\xd8\x42" + b"A" * 16 # fixext 16
assert p(b"ABC") == b"\xc7\x03\x42ABC" # ext 8
assert p(b"A" * 0x0123) == b"\xc8\x01\x23\x42" + b"A" * 0x0123 # ext 16
- assert (
- p(b"A" * 0x00012345) == b"\xc9\x00\x01\x23\x45\x42" + b"A" * 0x00012345
- ) # ext 32
+ assert p(b"A" * 0x00012345) == b"\xc9\x00\x01\x23\x45\x42" + b"A" * 0x00012345 # ext 32
def test_unpack_ext_type():
diff --git a/test/test_format.py b/test/test_format.py
index fbbc3f98..11d179f3 100644
--- a/test/test_format.py
+++ b/test/test_format.py
@@ -25,9 +25,7 @@ def testFixRaw():
def testFixMap():
- check(
- b"\x82\xc2\x81\xc0\xc0\xc3\x81\xc0\x80", {False: {None: None}, True: {None: {}}}
- )
+ check(b"\x82\xc2\x81\xc0\xc0\xc3\x81\xc0\x80", {False: {None: None}, True: {None: {}}})
def testUnsignedInt():
diff --git a/test/test_pack.py b/test/test_pack.py
index 65c9cb17..b14b381e 100644
--- a/test/test_pack.py
+++ b/test/test_pack.py
@@ -81,9 +81,7 @@ def testPackByteArrays():
def testIgnoreUnicodeErrors():
- re = unpackb(
- packb(b"abc\xeddef", use_bin_type=False), raw=False, unicode_errors="ignore"
- )
+ re = unpackb(packb(b"abc\xeddef", use_bin_type=False), raw=False, unicode_errors="ignore")
assert re == "abcdef"
diff --git a/test/test_stricttype.py b/test/test_stricttype.py
index fe9ec6cd..b2c6afce 100644
--- a/test/test_stricttype.py
+++ b/test/test_stricttype.py
@@ -44,9 +44,7 @@ def test_tuple_ext():
def default(o):
if isinstance(o, tuple):
# Convert to list and pack
- payload = packb(
- list(o), strict_types=True, use_bin_type=True, default=default
- )
+ payload = packb(list(o), strict_types=True, use_bin_type=True, default=default)
return ExtType(MSGPACK_EXT_TYPE_TUPLE, payload)
raise TypeError(repr(o))
From 89c02cacf77711a96b905b2bbc41200dfe56724a Mon Sep 17 00:00:00 2001
From: Evgeny Markov <evgenymarkov@yandex.com>
Date: Tue, 23 May 2023 01:40:16 +0200
Subject: [PATCH 2/6] Prepare codebase for Python 3.7
---
Makefile | 4 ++++
msgpack/__init__.py | 1 -
msgpack/ext.py | 7 +++---
msgpack/fallback.py | 51 +++++++++++++----------------------------
requirements.txt | 1 +
setup.py | 3 +--
test/test_buffer.py | 1 -
test/test_case.py | 7 +++---
test/test_except.py | 1 -
test/test_extension.py | 3 +--
test/test_format.py | 1 -
test/test_limits.py | 2 --
test/test_memoryview.py | 1 -
test/test_newspec.py | 2 --
test/test_obj.py | 1 -
test/test_pack.py | 8 +++----
test/test_seq.py | 1 -
test/test_sequnpack.py | 1 -
test/test_stricttype.py | 8 +++----
test/test_subtype.py | 1 -
test/test_unpack.py | 2 +-
21 files changed, 36 insertions(+), 71 deletions(-)
diff --git a/Makefile b/Makefile
index 30526928..e4f22da4 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,10 @@ all: cython
black:
black $(PYTHON_SOURCES)
+.PHONY: pyupgrade
+pyupgrade:
+ @find $(PYTHON_SOURCES) -name '*.py' -type f -exec pyupgrade --py37-plus '{}' \;
+
.PHONY: cython
cython:
cython --cplus msgpack/_cmsgpack.pyx
diff --git a/msgpack/__init__.py b/msgpack/__init__.py
index 6c10dc23..638236fe 100644
--- a/msgpack/__init__.py
+++ b/msgpack/__init__.py
@@ -1,4 +1,3 @@
-# coding: utf-8
from .exceptions import *
from .ext import ExtType, Timestamp
diff --git a/msgpack/ext.py b/msgpack/ext.py
index a724a87f..97942949 100644
--- a/msgpack/ext.py
+++ b/msgpack/ext.py
@@ -1,4 +1,3 @@
-# coding: utf-8
from collections import namedtuple
import datetime
import sys
@@ -15,10 +14,10 @@ def __new__(cls, code, data):
raise TypeError("data must be bytes")
if not 0 <= code <= 127:
raise ValueError("code must be 0~127")
- return super(ExtType, cls).__new__(cls, code, data)
+ return super().__new__(cls, code, data)
-class Timestamp(object):
+class Timestamp:
"""Timestamp represents the Timestamp extension type in msgpack.
When built with Cython, msgpack uses C methods to pack and unpack `Timestamp`. When using pure-Python
@@ -53,7 +52,7 @@ def __init__(self, seconds, nanoseconds=0):
def __repr__(self):
"""String representation of Timestamp."""
- return "Timestamp(seconds={0}, nanoseconds={1})".format(self.seconds, self.nanoseconds)
+ return f"Timestamp(seconds={self.seconds}, nanoseconds={self.nanoseconds})"
def __eq__(self, other):
"""Check for equality with another Timestamp object"""
diff --git a/msgpack/fallback.py b/msgpack/fallback.py
index 412aee65..eb517114 100644
--- a/msgpack/fallback.py
+++ b/msgpack/fallback.py
@@ -4,23 +4,6 @@
import struct
-if sys.version_info < (3, 5):
- # Ugly hack...
- RecursionError = RuntimeError
-
- def _is_recursionerror(e):
- return (
- len(e.args) == 1
- and isinstance(e.args[0], str)
- and e.args[0].startswith("maximum recursion depth exceeded")
- )
-
-else:
-
- def _is_recursionerror(e):
- return True
-
-
if hasattr(sys, "pypy_version_info"):
# StringIO is slow on PyPy, StringIO is faster. However: PyPy's own
# StringBuilder is fastest.
@@ -32,7 +15,7 @@ def _is_recursionerror(e):
from __pypy__.builders import StringBuilder
USING_STRINGBUILDER = True
- class StringIO(object):
+ class StringIO:
def __init__(self, s=b""):
if s:
self.builder = StringBuilder(len(s))
@@ -109,10 +92,8 @@ def unpackb(packed, **kwargs):
ret = unpacker._unpack()
except OutOfData:
raise ValueError("Unpack failed: incomplete input")
- except RecursionError as e:
- if _is_recursionerror(e):
- raise StackError
- raise
+ except RecursionError:
+ raise StackError
if unpacker._got_extradata():
raise ExtraData(ret, unpacker._get_extradata())
return ret
@@ -151,7 +132,7 @@ def unpackb(packed, **kwargs):
}
-class Unpacker(object):
+class Unpacker:
"""Streaming unpacker.
Arguments:
@@ -426,18 +407,18 @@ def _read_header(self):
n = b & 0b00011111
typ = TYPE_RAW
if n > self._max_str_len:
- raise ValueError("%s exceeds max_str_len(%s)" % (n, self._max_str_len))
+ raise ValueError(f"{n} exceeds max_str_len({self._max_str_len})")
obj = self._read(n)
elif b & 0b11110000 == 0b10010000:
n = b & 0b00001111
typ = TYPE_ARRAY
if n > self._max_array_len:
- raise ValueError("%s exceeds max_array_len(%s)" % (n, self._max_array_len))
+ raise ValueError(f"{n} exceeds max_array_len({self._max_array_len})")
elif b & 0b11110000 == 0b10000000:
n = b & 0b00001111
typ = TYPE_MAP
if n > self._max_map_len:
- raise ValueError("%s exceeds max_map_len(%s)" % (n, self._max_map_len))
+ raise ValueError(f"{n} exceeds max_map_len({self._max_map_len})")
elif b == 0xC0:
obj = None
elif b == 0xC2:
@@ -453,7 +434,7 @@ def _read_header(self):
n = self._buffer[self._buff_i]
self._buff_i += size
if n > self._max_bin_len:
- raise ValueError("%s exceeds max_bin_len(%s)" % (n, self._max_bin_len))
+ raise ValueError(f"{n} exceeds max_bin_len({self._max_bin_len})")
obj = self._read(n)
elif 0xC7 <= b <= 0xC9:
size, fmt, typ = _MSGPACK_HEADERS[b]
@@ -461,7 +442,7 @@ def _read_header(self):
L, n = struct.unpack_from(fmt, self._buffer, self._buff_i)
self._buff_i += size
if L > self._max_ext_len:
- raise ValueError("%s exceeds max_ext_len(%s)" % (L, self._max_ext_len))
+ raise ValueError(f"{L} exceeds max_ext_len({self._max_ext_len})")
obj = self._read(L)
elif 0xCA <= b <= 0xD3:
size, fmt = _MSGPACK_HEADERS[b]
@@ -474,7 +455,7 @@ def _read_header(self):
elif 0xD4 <= b <= 0xD8:
size, fmt, typ = _MSGPACK_HEADERS[b]
if self._max_ext_len < size:
- raise ValueError("%s exceeds max_ext_len(%s)" % (size, self._max_ext_len))
+ raise ValueError(f"{size} exceeds max_ext_len({self._max_ext_len})")
self._reserve(size + 1)
n, obj = struct.unpack_from(fmt, self._buffer, self._buff_i)
self._buff_i += size + 1
@@ -487,7 +468,7 @@ def _read_header(self):
n = self._buffer[self._buff_i]
self._buff_i += size
if n > self._max_str_len:
- raise ValueError("%s exceeds max_str_len(%s)" % (n, self._max_str_len))
+ raise ValueError(f"{n} exceeds max_str_len({self._max_str_len})")
obj = self._read(n)
elif 0xDC <= b <= 0xDD:
size, fmt, typ = _MSGPACK_HEADERS[b]
@@ -495,14 +476,14 @@ def _read_header(self):
(n,) = struct.unpack_from(fmt, self._buffer, self._buff_i)
self._buff_i += size
if n > self._max_array_len:
- raise ValueError("%s exceeds max_array_len(%s)" % (n, self._max_array_len))
+ raise ValueError(f"{n} exceeds max_array_len({self._max_array_len})")
elif 0xDE <= b <= 0xDF:
size, fmt, typ = _MSGPACK_HEADERS[b]
self._reserve(size)
(n,) = struct.unpack_from(fmt, self._buffer, self._buff_i)
self._buff_i += size
if n > self._max_map_len:
- raise ValueError("%s exceeds max_map_len(%s)" % (n, self._max_map_len))
+ raise ValueError(f"{n} exceeds max_map_len({self._max_map_len})")
else:
raise FormatError("Unknown header: 0x%x" % b)
return typ, n, obj
@@ -623,7 +604,7 @@ def tell(self):
return self._stream_offset
-class Packer(object):
+class Packer:
"""
MessagePack Packer
@@ -833,9 +814,9 @@ def _pack(
continue
if self._datetime and check(obj, _DateTime):
- raise ValueError("Cannot serialize %r where tzinfo=None" % (obj,))
+ raise ValueError(f"Cannot serialize {obj!r} where tzinfo=None")
- raise TypeError("Cannot serialize %r" % (obj,))
+ raise TypeError(f"Cannot serialize {obj!r}")
def pack(self, obj):
try:
diff --git a/requirements.txt b/requirements.txt
index efc532c3..c56c5b7a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,3 +3,4 @@ Cython~=0.29.30
# Tools required only for development. No need to add it to pyproject.toml file.
black==23.3.0
+pyupgrade==3.4.0
diff --git a/setup.py b/setup.py
index 3f93a984..1cd1e8eb 100755
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-# coding: utf-8
import io
import os
import sys
@@ -25,7 +24,7 @@ class NoCython(Exception):
def cythonize(src):
- sys.stderr.write("cythonize: %r\n" % (src,))
+ sys.stderr.write(f"cythonize: {src!r}\n")
cython_compiler.compile([src], cplus=True)
diff --git a/test/test_buffer.py b/test/test_buffer.py
index 04470584..7ee674ae 100644
--- a/test/test_buffer.py
+++ b/test/test_buffer.py
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-# coding: utf-8
import sys
import pytest
diff --git a/test/test_case.py b/test/test_case.py
index 1c4e3229..c4c615e3 100644
--- a/test/test_case.py
+++ b/test/test_case.py
@@ -1,11 +1,10 @@
#!/usr/bin/env python
-# coding: utf-8
from msgpack import packb, unpackb
def check(length, obj, use_bin_type=True):
v = packb(obj, use_bin_type=use_bin_type)
- assert len(v) == length, "%r length should be %r but get %r" % (obj, length, len(v))
+ assert len(v) == length, f"{obj!r} length should be {length!r} but get {len(v)!r}"
assert unpackb(v, use_list=0, raw=not use_bin_type) == obj
@@ -120,11 +119,11 @@ def test_match():
),
({}, b"\x80"),
(
- dict([(x, x) for x in range(15)]),
+ {x: x for x in range(15)},
b"\x8f\x00\x00\x01\x01\x02\x02\x03\x03\x04\x04\x05\x05\x06\x06\x07\x07\x08\x08\t\t\n\n\x0b\x0b\x0c\x0c\r\r\x0e\x0e",
),
(
- dict([(x, x) for x in range(16)]),
+ {x: x for x in range(16)},
b"\xde\x00\x10\x00\x00\x01\x01\x02\x02\x03\x03\x04\x04\x05\x05\x06\x06\x07\x07\x08\x08\t\t\n\n\x0b\x0b\x0c\x0c\r\r\x0e\x0e\x0f\x0f",
),
]
diff --git a/test/test_except.py b/test/test_except.py
index 745ebecb..8c0a9766 100644
--- a/test/test_except.py
+++ b/test/test_except.py
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-# coding: utf-8
from pytest import raises
from msgpack import packb, unpackb, Unpacker, FormatError, StackError, OutOfData
diff --git a/test/test_extension.py b/test/test_extension.py
index 7adefc47..9e5e6aad 100644
--- a/test/test_extension.py
+++ b/test/test_extension.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
import array
import msgpack
from msgpack import ExtType
@@ -47,7 +46,7 @@ def default(obj):
except AttributeError:
data = obj.tostring()
return ExtType(typecode, data)
- raise TypeError("Unknown type object %r" % (obj,))
+ raise TypeError(f"Unknown type object {obj!r}")
def ext_hook(code, data):
print("ext_hook called", code, data)
diff --git a/test/test_format.py b/test/test_format.py
index 11d179f3..c06c87dc 100644
--- a/test/test_format.py
+++ b/test/test_format.py
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-# coding: utf-8
from msgpack import unpackb
diff --git a/test/test_limits.py b/test/test_limits.py
index 4314c2c0..533bc112 100644
--- a/test/test_limits.py
+++ b/test/test_limits.py
@@ -1,6 +1,4 @@
#!/usr/bin/env python
-# coding: utf-8
-from __future__ import absolute_import, division, print_function, unicode_literals
import pytest
from msgpack import (
diff --git a/test/test_memoryview.py b/test/test_memoryview.py
index 63beab10..eaadef73 100644
--- a/test/test_memoryview.py
+++ b/test/test_memoryview.py
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-# coding: utf-8
import pytest
from array import array
diff --git a/test/test_newspec.py b/test/test_newspec.py
index b7da486e..a6f4251b 100644
--- a/test/test_newspec.py
+++ b/test/test_newspec.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
from msgpack import packb, unpackb, ExtType
diff --git a/test/test_obj.py b/test/test_obj.py
index 86c557cd..d3f870d9 100644
--- a/test/test_obj.py
+++ b/test/test_obj.py
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-# coding: utf-8
from pytest import raises
from msgpack import packb, unpackb
diff --git a/test/test_pack.py b/test/test_pack.py
index b14b381e..2753e469 100644
--- a/test/test_pack.py
+++ b/test/test_pack.py
@@ -1,6 +1,4 @@
#!/usr/bin/env python
-# coding: utf-8
-from __future__ import absolute_import, division, print_function, unicode_literals
from collections import OrderedDict
from io import BytesIO
@@ -106,8 +104,8 @@ def testDecodeBinary():
def testPackFloat():
- assert packb(1.0, use_single_float=True) == b"\xca" + struct.pack(str(">f"), 1.0)
- assert packb(1.0, use_single_float=False) == b"\xcb" + struct.pack(str(">d"), 1.0)
+ assert packb(1.0, use_single_float=True) == b"\xca" + struct.pack(">f", 1.0)
+ assert packb(1.0, use_single_float=False) == b"\xcb" + struct.pack(">d", 1.0)
def testArraySize(sizes=[0, 5, 50, 1000]):
@@ -152,7 +150,7 @@ def testMapSize(sizes=[0, 5, 50, 1000]):
bio.seek(0)
unpacker = Unpacker(bio, strict_map_key=False)
for size in sizes:
- assert unpacker.unpack() == dict((i, i * 2) for i in range(size))
+ assert unpacker.unpack() == {i: i * 2 for i in range(size)}
def test_odict():
diff --git a/test/test_seq.py b/test/test_seq.py
index 0d5d8065..def6630d 100644
--- a/test/test_seq.py
+++ b/test/test_seq.py
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-# coding: utf-8
import io
import msgpack
diff --git a/test/test_sequnpack.py b/test/test_sequnpack.py
index c091076b..6b138aad 100644
--- a/test/test_sequnpack.py
+++ b/test/test_sequnpack.py
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-# coding: utf-8
import io
from msgpack import Unpacker, BufferFull
from msgpack import pack, packb
diff --git a/test/test_stricttype.py b/test/test_stricttype.py
index b2c6afce..9ffaff25 100644
--- a/test/test_stricttype.py
+++ b/test/test_stricttype.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
from collections import namedtuple
from msgpack import packb, unpackb, ExtType
@@ -10,7 +8,7 @@ def test_namedtuple():
def default(o):
if isinstance(o, T):
return dict(o._asdict())
- raise TypeError("Unsupported type %s" % (type(o),))
+ raise TypeError(f"Unsupported type {type(o)}")
packed = packb(T(1, 42), strict_types=True, use_bin_type=True, default=default)
unpacked = unpackb(packed, raw=False)
@@ -23,7 +21,7 @@ def test_tuple():
def default(o):
if isinstance(o, tuple):
return {"__type__": "tuple", "value": list(o)}
- raise TypeError("Unsupported type %s" % (type(o),))
+ raise TypeError(f"Unsupported type {type(o)}")
def convert(o):
if o.get("__type__") == "tuple":
@@ -52,7 +50,7 @@ def convert(code, payload):
if code == MSGPACK_EXT_TYPE_TUPLE:
# Unpack and convert to tuple
return tuple(unpackb(payload, raw=False, ext_hook=convert))
- raise ValueError("Unknown Ext code {}".format(code))
+ raise ValueError(f"Unknown Ext code {code}")
data = packb(t, strict_types=True, use_bin_type=True, default=default)
expected = unpackb(data, raw=False, ext_hook=convert)
diff --git a/test/test_subtype.py b/test/test_subtype.py
index d91d4553..d5a9adb3 100644
--- a/test/test_subtype.py
+++ b/test/test_subtype.py
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-# coding: utf-8
from msgpack import packb, unpackb
from collections import namedtuple
diff --git a/test/test_unpack.py b/test/test_unpack.py
index c7141024..bf3f960d 100644
--- a/test/test_unpack.py
+++ b/test/test_unpack.py
@@ -52,7 +52,7 @@ def hook(x):
def test_unpacker_ext_hook():
class MyUnpacker(Unpacker):
def __init__(self):
- super(MyUnpacker, self).__init__(ext_hook=self._hook, raw=False)
+ super().__init__(ext_hook=self._hook, raw=False)
def _hook(self, code, data):
if code == 1:
From 517c08502b7451b78cf235795b823b8bc1085be1 Mon Sep 17 00:00:00 2001
From: Evgeny Markov <evgenymarkov@yandex.com>
Date: Tue, 23 May 2023 01:42:44 +0200
Subject: [PATCH 3/6] Install pytest as development dependency
---
requirements.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/requirements.txt b/requirements.txt
index c56c5b7a..5aeb74dc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,4 +3,5 @@ Cython~=0.29.30
# Tools required only for development. No need to add it to pyproject.toml file.
black==23.3.0
+pytest==7.3.1
pyupgrade==3.4.0
From 17e3ad52eb0275c7613038be97a1ee5213d54eec Mon Sep 17 00:00:00 2001
From: Evgeny Markov <evgenymarkov@yandex.com>
Date: Tue, 23 May 2023 13:24:23 +0200
Subject: [PATCH 4/6] Remove Python 3.6 from setup.cfg file
---
setup.cfg | 1 -
1 file changed, 1 deletion(-)
diff --git a/setup.cfg b/setup.cfg
index e3782842..d6888fcf 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,7 +17,6 @@ project_urls =
classifiers =
Programming Language :: Python :: 3
- Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
From 05bcedf88dbc8e08477a9537aae1bf4e0452bf81 Mon Sep 17 00:00:00 2001
From: Evgeny Markov <evgenymarkov@yandex.com>
Date: Tue, 23 May 2023 13:33:27 +0200
Subject: [PATCH 5/6] Downgrade pyupgrade to 3.3.2
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 5aeb74dc..88b5eb97 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,4 +4,4 @@ Cython~=0.29.30
# Tools required only for development. No need to add it to pyproject.toml file.
black==23.3.0
pytest==7.3.1
-pyupgrade==3.4.0
+pyupgrade==3.3.2
From cbb7e6d8168511a6a60bdd9eee923633629aa553 Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Wed, 24 May 2023 01:35:25 +0900
Subject: [PATCH 6/6] Update msgpack/fallback.py
---
msgpack/fallback.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/msgpack/fallback.py b/msgpack/fallback.py
index eb517114..ac1eaf4c 100644
--- a/msgpack/fallback.py
+++ b/msgpack/fallback.py
@@ -315,7 +315,7 @@ def __init__(
if object_pairs_hook is not None and not callable(object_pairs_hook):
raise TypeError("`object_pairs_hook` is not callable")
if object_hook is not None and object_pairs_hook is not None:
- raise TypeError("object_pairs_hook and object_hook are mutually " "exclusive")
+ raise TypeError("object_pairs_hook and object_hook are mutually exclusive")
if not callable(ext_hook):
raise TypeError("`ext_hook` is not callable")