Skip to content

Commit

Permalink
Remove python2 compatibility code
Browse files Browse the repository at this point in the history
  • Loading branch information
matusvalo committed Nov 23, 2020
1 parent 26864d6 commit fb8bc74
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 34 deletions.
4 changes: 0 additions & 4 deletions kombu/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
9 changes: 2 additions & 7 deletions kombu/serialization.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
2 changes: 1 addition & 1 deletion kombu/transport/virtual/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
Expand Down
18 changes: 3 additions & 15 deletions kombu/utils/functional.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from collections import OrderedDict, UserDict
from collections.abc import Iterable, Mapping
import random
import sys
import threading
import inspect

Expand Down Expand Up @@ -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):
Expand Down
7 changes: 0 additions & 7 deletions t/unit/test_serialization.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/usr/bin/python

import pytest
import sys

from base64 import b64decode

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit fb8bc74

Please sign in to comment.