Skip to content

Drop python2 support #519

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 12 commits into from
May 21, 2023
Merged

Drop python2 support #519

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
167dedb
Remove python2 tox configuration
sblondon Sep 10, 2022
868f64c
Remove python2 condition to skip tests
sblondon Sep 10, 2022
3fbf7d5
Remove python2 cases
sblondon Sep 11, 2022
5c2f9fc
Inline compatibility constants and functions
sblondon Sep 11, 2022
e42757a
timezone.utc attribute exists in python3 supported releases
sblondon Dec 4, 2022
010ce5d
fix: spellcheck 'integer'
sblondon Dec 5, 2022
f709beb
refactoring: inline a constant
sblondon Dec 5, 2022
e139aa5
remove python2 references in docstrings
sblondon Dec 5, 2022
8c01b60
remove unused constant
sblondon Dec 6, 2022
8b1e561
remove uneeded 'u' prefix to strings
sblondon Dec 9, 2022
947b82a
reformat (black)
sblondon Dec 9, 2022
5f251f5
Merge branch 'main' into drop-python2
methane May 21, 2023
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
Prev Previous commit
Next Next commit
Remove python2 cases
  • Loading branch information
@sblondon
sblondon committed Sep 11, 2022
commit 3fbf7d5c26e2cb07ba66df359278bea495307ab5
2 changes: 1 addition & 1 deletion msgpack/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
__version__ = "1.0.4"


if os.environ.get("MSGPACK_PUREPYTHON") or sys.version_info[0] == 2:
if os.environ.get("MSGPACK_PUREPYTHON"):
from .fallback import Packer, unpackb, Unpacker
else:
try:
Expand Down
16 changes: 5 additions & 11 deletions msgpack/ext.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,11 @@
import struct


PY2 = sys.version_info[0] == 2

if PY2:
int_types = (int, long)
_utc = None
else:
int_types = int
try:
_utc = datetime.timezone.utc
except AttributeError:
_utc = datetime.timezone(datetime.timedelta(0))
int_types = int
try:
_utc = datetime.timezone.utc
Comment thread
sblondon marked this conversation as resolved.
Outdated
except AttributeError:
_utc = datetime.timezone(datetime.timedelta(0))


class ExtType(namedtuple("ExtType", "code data")):
Expand Down
33 changes: 8 additions & 25 deletions msgpack/fallback.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,12 @@
import struct


PY2 = sys.version_info[0] == 2
if PY2:
int_types = (int, long)
int_types = int
unicode = str
xrange = range

def dict_iteritems(d):
return d.iteritems()

else:
int_types = int
unicode = str
xrange = range

def dict_iteritems(d):
return d.items()
def dict_iteritems(d):
return d.items()


if sys.version_info < (3, 5):
Expand Down Expand Up @@ -134,14 +126,7 @@ def unpackb(packed, **kwargs):
return ret


if sys.version_info < (2, 7, 6):

def _unpack_from(f, b, o=0):
"""Explicit type cast for legacy struct.unpack_from"""
return struct.unpack_from(f, bytes(b), o)

else:
_unpack_from = struct.unpack_from
_unpack_from = struct.unpack_from

_NO_FORMAT_USED = ""
_MSGPACK_HEADERS = {
Expand Down Expand Up @@ -585,7 +570,7 @@ def _unpack(self, execute=EX_CONSTRUCT):
raise ValueError(
"%s is not allowed for map key" % str(type(key))
)
if not PY2 and type(key) is str:
if type(key) is str:
key = sys.intern(key)
ret[key] = self._unpack(EX_CONSTRUCT)
if self._object_hook is not None:
Expand Down Expand Up @@ -743,8 +728,6 @@ def __init__(
self._autoreset = autoreset
self._use_bin_type = use_bin_type
self._buffer = StringIO()
if PY2 and datetime:
raise ValueError("datetime is not supported in Python 2")
self._datetime = bool(datetime)
self._unicode_errors = unicode_errors or "strict"
if default is not None:
Expand Down Expand Up @@ -1004,7 +987,7 @@ def reset(self):

def getbuffer(self):
"""Return view of internal buffer."""
if USING_STRINGBUILDER or PY2:
if USING_STRINGBUILDER:
return memoryview(self.bytes())
else:
return self._buffer.getbuffer()
3 changes: 1 addition & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@


PYPY = hasattr(sys, "pypy_version_info")
PY2 = sys.version_info[0] == 2


class NoCython(Exception):
Expand Down Expand Up @@ -79,7 +78,7 @@ def __init__(self, *args, **kwargs):
macros = [("__LITTLE_ENDIAN__", "1")]

ext_modules = []
if not PYPY and not PY2 and not os.environ.get("MSGPACK_PUREPYTHON"):
if not PYPY and not os.environ.get("MSGPACK_PUREPYTHON"):
ext_modules.append(
Extension(
"msgpack._cmsgpack",
Expand Down
10 changes: 2 additions & 8 deletions test/test_extension.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,7 @@ def ext_hook(code, data):
print("ext_hook called", code, data)
assert code == 123
obj = array.array("d")
try:
obj.frombytes(data)
except AttributeError: # PY2
obj.fromstring(data)
obj.frombytes(data)
return obj

obj = [42, b"hello", array.array("d", [1.1, 2.2, 3.3])]
Expand All @@ -67,10 +64,7 @@ def ext_hook(code, data):
assert obj == obj2


import sys

if sys.version > "3":
long = int
long = int


def test_overriding_hooks():
Expand Down
4 changes: 1 addition & 3 deletions test/test_timestamp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
import datetime
import msgpack
from msgpack.ext import Timestamp

if sys.version_info[0] > 2:
from msgpack.ext import _utc
from msgpack.ext import _utc


def test_timestamp():
Expand Down