From 957dfdbb44b321919b5047c6ce074cf0d5840e2c Mon Sep 17 00:00:00 2001 From: Noel Maersk Date: Thu, 9 May 2019 16:03:03 +0300 Subject: [PATCH] misc: use `collections.abc` to import ABCs from. Squelches remaining warnings of this type: DeprecationWarning: Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated, and in 3.8 it will stop working --- rlp/codec.py | 4 ++-- rlp/sedes/lists.py | 2 +- rlp/sedes/serializable.py | 2 +- tests/test_lazy.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rlp/codec.py b/rlp/codec.py index c80f261..21c74e1 100644 --- a/rlp/codec.py +++ b/rlp/codec.py @@ -77,7 +77,7 @@ def encode_raw(item): return item payload = item prefix_offset = 128 # string - elif not isinstance(item, str) and isinstance(item, collections.Sequence): + elif not isinstance(item, str) and isinstance(item, collections.abc.Sequence): payload = b''.join(encode_raw(x) for x in item) prefix_offset = 192 # list else: @@ -274,7 +274,7 @@ def infer_sedes(obj): return big_endian_int elif BinaryClass.is_valid_type(obj): return binary - elif not isinstance(obj, str) and isinstance(obj, collections.Sequence): + elif not isinstance(obj, str) and isinstance(obj, collections.abc.Sequence): return List(map(infer_sedes, obj)) elif isinstance(obj, bool): return boolean diff --git a/rlp/sedes/lists.py b/rlp/sedes/lists.py index 1285cac..64b4615 100644 --- a/rlp/sedes/lists.py +++ b/rlp/sedes/lists.py @@ -1,7 +1,7 @@ """ Module for sedes objects that use lists as serialization format. """ -from collections import Sequence +from collections.abc import Sequence from eth_utils import ( to_list, diff --git a/rlp/sedes/serializable.py b/rlp/sedes/serializable.py index 991b5ba..0bd6f35 100644 --- a/rlp/sedes/serializable.py +++ b/rlp/sedes/serializable.py @@ -186,7 +186,7 @@ def Changeset(obj, changes): return cls(obj, changes) -class BaseSerializable(collections.Sequence): +class BaseSerializable(collections.abc.Sequence): def __init__(self, *args, **kwargs): if kwargs: field_values = merge_kwargs_to_args(args, kwargs, self._meta.field_names) diff --git a/tests/test_lazy.py b/tests/test_lazy.py index 2f0f61a..bbbbb37 100644 --- a/tests/test_lazy.py +++ b/tests/test_lazy.py @@ -1,4 +1,4 @@ -from collections import Sequence +from collections.abc import Sequence import pytest