Visitar URL original
Cleanup code and pyproject by methane · Pull Request #608 · msgpack/msgpack-python · GitHub
Skip to content

Cleanup code and pyproject #608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
methane merged 4 commits into from
May 6, 2024
Merged

Cleanup code and pyproject #608

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
949201e
cleanup pyproject and fallback
methane May 6, 2024
1372686
code cleanup
methane May 6, 2024
51ef2d9
cleanup pyproject
methane May 6, 2024
31b415b
fixup
methane May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
cleanup pyproject and fallback
  • Loading branch information
@methane
methane committed May 6, 2024
commit 949201e5c0efc82ace4974dff184378ddd11f2df
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ all: cython

.PHONY: format
format:
pipx run ruff format $(PYTHON_SOURCES)
ruff format $(PYTHON_SOURCES)

.PHONY: lint
lint:
pipx run ruff check $(PYTHON_SOURCES)
ruff check $(PYTHON_SOURCES)

.PHONY: doc
doc:
Expand Down
37 changes: 16 additions & 21 deletions msgpack/fallback.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,18 @@


if hasattr(sys, "pypy_version_info"):
# StringIO is slow on PyPy, StringIO is faster. However: PyPy's own
# StringBuilder is fastest.
from __pypy__ import newlist_hint
from __pypy__.builders import BytesBuilder

try:
from __pypy__.builders import BytesBuilder as StringBuilder
except ImportError:
from __pypy__.builders import StringBuilder
USING_STRINGBUILDER = True
_USING_STRINGBUILDER = True

class StringIO:
class BytesIO:
def __init__(self, s=b""):
if s:
self.builder = StringBuilder(len(s))
self.builder = BytesBuilder(len(s))
self.builder.append(s)
else:
self.builder = StringBuilder()
self.builder = BytesBuilder()

def write(self, s):
if isinstance(s, memoryview):
Expand All @@ -35,14 +30,13 @@ def getvalue(self):
return self.builder.build()

else:
USING_STRINGBUILDER = False
from io import BytesIO as StringIO
from io import BytesIO

newlist_hint = lambda size: []
_USING_STRINGBUILDER = False


from .exceptions import BufferFull, OutOfData, ExtraData, FormatError, StackError

from .ext import ExtType, Timestamp


Expand Down Expand Up @@ -335,6 +329,7 @@ def feed(self, next_bytes):

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

def _consume(self):
"""Gets rid of the used parts of the buffer."""
Expand Down Expand Up @@ -671,7 +666,7 @@ def __init__(
self._use_float = use_single_float
self._autoreset = autoreset
self._use_bin_type = use_bin_type
self._buffer = StringIO()
self._buffer = BytesIO()
self._datetime = bool(datetime)
self._unicode_errors = unicode_errors or "strict"
if default is not None:
Expand Down Expand Up @@ -807,18 +802,18 @@ def pack(self, obj):
try:
self._pack(obj)
except:
self._buffer = StringIO() # force reset
self._buffer = BytesIO() # force reset
raise
if self._autoreset:
ret = self._buffer.getvalue()
self._buffer = StringIO()
self._buffer = BytesIO()
return ret

def pack_map_pairs(self, pairs):
self._pack_map_pairs(len(pairs), pairs)
if self._autoreset:
ret = self._buffer.getvalue()
self._buffer = StringIO()
self._buffer = BytesIO()
return ret

def pack_array_header(self, n):
Expand All @@ -827,7 +822,7 @@ def pack_array_header(self, n):
self._pack_array_header(n)
if self._autoreset:
ret = self._buffer.getvalue()
self._buffer = StringIO()
self._buffer = BytesIO()
return ret

def pack_map_header(self, n):
Expand All @@ -836,7 +831,7 @@ def pack_map_header(self, n):
self._pack_map_header(n)
if self._autoreset:
ret = self._buffer.getvalue()
self._buffer = StringIO()
self._buffer = BytesIO()
return ret

def pack_ext_type(self, typecode, data):
Expand Down Expand Up @@ -925,11 +920,11 @@ def reset(self):

This method is useful only when autoreset=False.
"""
self._buffer = StringIO()
self._buffer = BytesIO()

def getbuffer(self):
"""Return view of internal buffer."""
if USING_STRINGBUILDER:
if _USING_STRINGBUILDER:
return memoryview(self.bytes())
else:
return self._buffer.getbuffer()
5 changes: 0 additions & 5 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,6 @@ include-package-data = false
[tool.setuptools.dynamic]
version = {attr = "msgpack.__version__"}

[tool.black]
line-length = 100
target-version = ["py37"]
skip_string_normalization = true

[tool.ruff]
line-length = 100
target-version = "py38"
Expand Down