From 4fdadbf4a02e66cf0dd3a439988843ef1afafb72 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Wed, 2 Jan 2019 14:35:47 -0500 Subject: [PATCH 1/2] Fix Py3.7 deprecation --- loopy/tools.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/loopy/tools.py b/loopy/tools.py index 8c5d36390..439600242 100644 --- a/loopy/tools.py +++ b/loopy/tools.py @@ -24,7 +24,7 @@ THE SOFTWARE. import six -import collections +import collections.abc as abc import numpy as np from pytools import memoize_method from pytools.persistent_dict import KeyBuilder as KeyBuilderBase @@ -456,7 +456,7 @@ class _PickledObjectWithEqAndPersistentHashKeys(_PickledObject): # {{{ lazily unpickling dictionary -class LazilyUnpicklingDict(collections.MutableMapping): +class LazilyUnpicklingDict(abc.MutableMapping): """A dictionary-like object which lazily unpickles its values. """ @@ -491,7 +491,7 @@ class LazilyUnpicklingDict(collections.MutableMapping): # {{{ lazily unpickling list -class LazilyUnpicklingList(collections.MutableSequence): +class LazilyUnpicklingList(abc.MutableSequence): """A list which lazily unpickles its values.""" def __init__(self, *args, **kwargs): -- GitLab From 6307424fe9fe85246debaa476d3695002d8b0306 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Wed, 2 Jan 2019 14:45:30 -0500 Subject: [PATCH 2/2] Py2 fix: Fix Py3.7 deprecation --- loopy/tools.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/loopy/tools.py b/loopy/tools.py index 439600242..7e9a89214 100644 --- a/loopy/tools.py +++ b/loopy/tools.py @@ -24,7 +24,12 @@ THE SOFTWARE. import six -import collections.abc as abc +try: + import collections.abc as abc +except ImportError: + # Python 2 + import collections as abc + import numpy as np from pytools import memoize_method from pytools.persistent_dict import KeyBuilder as KeyBuilderBase -- GitLab