diff --git a/kombu/__init__.py b/kombu/__init__.py index e555262ec..a01ed151e 100644 --- a/kombu/__init__.py +++ b/kombu/__init__.py @@ -3,10 +3,6 @@ import os import re import sys - -if sys.version_info < (2, 7): # pragma: no cover - raise Exception('Kombu 4.6 requires Python versions 2.7 or later.') - from collections import namedtuple # noqa __version__ = '5.0.2' diff --git a/kombu/serialization.py b/kombu/serialization.py index b35cc2b86..1b9a0a6a7 100644 --- a/kombu/serialization.py +++ b/kombu/serialization.py @@ -330,13 +330,8 @@ def not_available(*args, **kwargs): registry.register('yaml', None, not_available, 'application/x-yaml') -if sys.version_info[0] == 3: # pragma: no cover - - def unpickle(s): - return pickle_loads(str_to_bytes(s)) - -else: - unpickle = pickle_loads # noqa +def unpickle(s): + return pickle_loads(str_to_bytes(s)) def register_pickle(): diff --git a/kombu/transport/virtual/base.py b/kombu/transport/virtual/base.py index 1f1b563e5..669c6f0fb 100644 --- a/kombu/transport/virtual/base.py +++ b/kombu/transport/virtual/base.py @@ -28,7 +28,7 @@ from .exchange import STANDARD_EXCHANGE_TYPES -ARRAY_TYPE_H = 'H' if sys.version_info[0] == 3 else b'H' +ARRAY_TYPE_H = 'H' UNDELIVERABLE_FMT = """\ Message could not be delivered: No queues bound to exchange {exchange!r} \ diff --git a/kombu/utils/functional.py b/kombu/utils/functional.py index ccc916126..02ed6ffa7 100644 --- a/kombu/utils/functional.py +++ b/kombu/utils/functional.py @@ -3,7 +3,6 @@ from collections import OrderedDict, UserDict from collections.abc import Iterable, Mapping import random -import sys import threading import inspect @@ -126,20 +125,9 @@ def __setstate__(self, state): self.__dict__ = state self.mutex = threading.RLock() - if sys.version_info[0] == 3: # pragma: no cover - keys = _iterate_keys - values = _iterate_values - items = _iterate_items - else: # noqa - - def keys(self): - return list(self._iterate_keys()) - - def values(self): - return list(self._iterate_values()) - - def items(self): - return list(self._iterate_items()) + keys = _iterate_keys + values = _iterate_values + items = _iterate_items def memoize(maxsize=None, keyfun=None, Cache=LRUCache): diff --git a/t/unit/test_serialization.py b/t/unit/test_serialization.py index 01cb20f1e..82aec807c 100644 --- a/t/unit/test_serialization.py +++ b/t/unit/test_serialization.py @@ -1,7 +1,6 @@ #!/usr/bin/python import pytest -import sys from base64 import b64decode @@ -202,12 +201,6 @@ def test_msgpack_loads(self): res = loads(msgpack_data, content_type='application/x-msgpack', content_encoding='binary') - if sys.version_info[0] < 3: - for k, v in res.items(): - if isinstance(v, str): - res[k] = v.encode() - if isinstance(v, (list, tuple)): - res[k] = [i.encode() for i in v] assert res == msgpack_py_data @t.skip.if_pypy