Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit33e0e86

Browse files
authored
Cleanup code and pyproject (#608)
* use isort* fallback: use BytesIO instead of StringIO. We had dropped Python 2already.
1 parente0f0e14 commit33e0e86

21 files changed

+73
-78
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ all: cython
66

77
.PHONY: format
88
format:
9-
pipx runruff format$(PYTHON_SOURCES)
9+
ruff format$(PYTHON_SOURCES)
1010

1111
.PHONY: lint
1212
lint:
13-
pipx runruff check$(PYTHON_SOURCES)
13+
ruff check$(PYTHON_SOURCES)
1414

1515
.PHONY: doc
1616
doc:

‎msgpack/__init__.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
from .exceptionsimport*
2-
from .extimportExtType,Timestamp
3-
1+
# ruff: noqa: F401
42
importos
53

4+
from .exceptionsimport*# noqa: F403
5+
from .extimportExtType,Timestamp
66

77
version= (1,0,8)
88
__version__="1.0.8"
99

1010

1111
ifos.environ.get("MSGPACK_PUREPYTHON"):
12-
from .fallbackimportPacker,unpackb,Unpacker
12+
from .fallbackimportPacker,Unpacker,unpackb
1313
else:
1414
try:
15-
from ._cmsgpackimportPacker,unpackb,Unpacker
15+
from ._cmsgpackimportPacker,Unpacker,unpackb
1616
exceptImportError:
17-
from .fallbackimportPacker,unpackb,Unpacker
17+
from .fallbackimportPacker,Unpacker,unpackb
1818

1919

2020
defpack(o,stream,**kwargs):

‎msgpack/ext.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
fromcollectionsimportnamedtuple
21
importdatetime
32
importstruct
3+
fromcollectionsimportnamedtuple
44

55

66
classExtType(namedtuple("ExtType","code data")):

‎msgpack/fallback.py‎

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,22 @@
11
"""Fallback pure Python implementation of msgpack"""
22

3-
fromdatetimeimportdatetimeas_DateTime
4-
importsys
53
importstruct
6-
4+
importsys
5+
fromdatetimeimportdatetimeas_DateTime
76

87
ifhasattr(sys,"pypy_version_info"):
9-
# StringIO is slow on PyPy, StringIO is faster. However: PyPy's own
10-
# StringBuilder is fastest.
118
from__pypy__importnewlist_hint
9+
from__pypy__.buildersimportBytesBuilder
1210

13-
try:
14-
from__pypy__.buildersimportBytesBuilderasStringBuilder
15-
exceptImportError:
16-
from__pypy__.buildersimportStringBuilder
17-
USING_STRINGBUILDER=True
11+
_USING_STRINGBUILDER=True
1812

19-
classStringIO:
13+
classBytesIO:
2014
def__init__(self,s=b""):
2115
ifs:
22-
self.builder=StringBuilder(len(s))
16+
self.builder=BytesBuilder(len(s))
2317
self.builder.append(s)
2418
else:
25-
self.builder=StringBuilder()
19+
self.builder=BytesBuilder()
2620

2721
defwrite(self,s):
2822
ifisinstance(s,memoryview):
@@ -35,17 +29,17 @@ def getvalue(self):
3529
returnself.builder.build()
3630

3731
else:
38-
USING_STRINGBUILDER=False
39-
fromioimportBytesIOasStringIO
32+
fromioimportBytesIO
4033

41-
newlist_hint=lambdasize: []
34+
_USING_STRINGBUILDER=False
4235

36+
defnewlist_hint(size):
37+
return []
4338

44-
from .exceptionsimportBufferFull,OutOfData,ExtraData,FormatError,StackError
4539

40+
from .exceptionsimportBufferFull,ExtraData,FormatError,OutOfData,StackError
4641
from .extimportExtType,Timestamp
4742

48-
4943
EX_SKIP=0
5044
EX_CONSTRUCT=1
5145
EX_READ_ARRAY_HEADER=2
@@ -335,6 +329,7 @@ def feed(self, next_bytes):
335329

336330
# Use extend here: INPLACE_ADD += doesn't reliably typecast memoryview in jython
337331
self._buffer.extend(view)
332+
view.release()
338333

339334
def_consume(self):
340335
"""Gets rid of the used parts of the buffer."""
@@ -671,12 +666,11 @@ def __init__(
671666
self._use_float=use_single_float
672667
self._autoreset=autoreset
673668
self._use_bin_type=use_bin_type
674-
self._buffer=StringIO()
669+
self._buffer=BytesIO()
675670
self._datetime=bool(datetime)
676671
self._unicode_errors=unicode_errorsor"strict"
677-
ifdefaultisnotNone:
678-
ifnotcallable(default):
679-
raiseTypeError("default must be callable")
672+
ifdefaultisnotNoneandnotcallable(default):
673+
raiseTypeError("default must be callable")
680674
self._default=default
681675

682676
def_pack(
@@ -807,18 +801,18 @@ def pack(self, obj):
807801
try:
808802
self._pack(obj)
809803
except:
810-
self._buffer=StringIO()# force reset
804+
self._buffer=BytesIO()# force reset
811805
raise
812806
ifself._autoreset:
813807
ret=self._buffer.getvalue()
814-
self._buffer=StringIO()
808+
self._buffer=BytesIO()
815809
returnret
816810

817811
defpack_map_pairs(self,pairs):
818812
self._pack_map_pairs(len(pairs),pairs)
819813
ifself._autoreset:
820814
ret=self._buffer.getvalue()
821-
self._buffer=StringIO()
815+
self._buffer=BytesIO()
822816
returnret
823817

824818
defpack_array_header(self,n):
@@ -827,7 +821,7 @@ def pack_array_header(self, n):
827821
self._pack_array_header(n)
828822
ifself._autoreset:
829823
ret=self._buffer.getvalue()
830-
self._buffer=StringIO()
824+
self._buffer=BytesIO()
831825
returnret
832826

833827
defpack_map_header(self,n):
@@ -836,7 +830,7 @@ def pack_map_header(self, n):
836830
self._pack_map_header(n)
837831
ifself._autoreset:
838832
ret=self._buffer.getvalue()
839-
self._buffer=StringIO()
833+
self._buffer=BytesIO()
840834
returnret
841835

842836
defpack_ext_type(self,typecode,data):
@@ -925,11 +919,11 @@ def reset(self):
925919
926920
This method is useful only when autoreset=False.
927921
"""
928-
self._buffer=StringIO()
922+
self._buffer=BytesIO()
929923

930924
defgetbuffer(self):
931925
"""Return view of internal buffer."""
932-
ifUSING_STRINGBUILDER:
926+
if_USING_STRINGBUILDER:
933927
returnmemoryview(self.bytes())
934928
else:
935929
returnself._buffer.getbuffer()

‎pyproject.toml‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,12 @@ include-package-data = false
4545
[tool.setuptools.dynamic]
4646
version = {attr ="msgpack.__version__"}
4747

48-
[tool.black]
49-
line-length =100
50-
target-version = ["py37"]
51-
skip_string_normalization =true
52-
5348
[tool.ruff]
5449
line-length =100
5550
target-version ="py38"
56-
lint.ignore = []
57-
58-
[tool.ruff.lint.per-file-ignores]
59-
"msgpack/__init__.py" = ["F401","F403"]
60-
"msgpack/fallback.py" = ["E731"]
61-
"test/test_seq.py" = ["E501"]
51+
lint.select = [
52+
"E",# pycodestyle
53+
"F",# Pyflakes
54+
"I",# isort
55+
#"UP", pyupgrade
56+
]

‎setup.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#!/usr/bin/env python
22
importos
33
importsys
4-
fromsetuptoolsimportsetup,Extension
4+
5+
fromsetuptoolsimportExtension,setup
56
fromsetuptools.command.build_extimportbuild_ext
67
fromsetuptools.command.sdistimportsdist
78

8-
99
PYPY=hasattr(sys,"pypy_version_info")
1010

1111

‎test/test_buffer.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
frompytestimportraises
22

3-
frommsgpackimportpackb,unpackb,Packer
3+
frommsgpackimportPacker,packb,unpackb
44

55

66
deftest_unpack_buffer():

‎test/test_except.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#!/usr/bin/env python
22

3+
importdatetime
4+
35
frompytestimportraises
4-
frommsgpackimportpackb,unpackb,Unpacker,FormatError,StackError,OutOfData
56

6-
importdatetime
7+
frommsgpackimportFormatError,OutOfData,StackError,Unpacker,packb,unpackb
78

89

910
classDummyException(Exception):

‎test/test_extension.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
importarray
2+
23
importmsgpack
34
frommsgpackimportExtType
45

‎test/test_limits.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
importpytest
33

44
frommsgpackimport (
5-
packb,
6-
unpackb,
7-
Packer,
8-
Unpacker,
95
ExtType,
6+
Packer,
107
PackOverflowError,
118
PackValueError,
9+
Unpacker,
1210
UnpackValueError,
11+
packb,
12+
unpackb,
1313
)
1414

1515

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp