From 4c935e7fb35c7711fcba508f0adaff90d6e98872 Mon Sep 17 00:00:00 2001 From: Alex Hall Date: Mon, 21 Feb 2022 14:44:44 +0200 Subject: [PATCH] (core) Import Hashable from six.moves.collections_abc Summary: Copy of https://github.com/gristlabs/grist-core/pull/136 Test Plan: this Reviewers: paulfitz Reviewed By: paulfitz Differential Revision: https://phab.getgrist.com/D3278 --- sandbox/grist/engine.py | 2 +- sandbox/grist/test_match_counter.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sandbox/grist/engine.py b/sandbox/grist/engine.py index 225482e8..2eda24e3 100644 --- a/sandbox/grist/engine.py +++ b/sandbox/grist/engine.py @@ -14,7 +14,7 @@ from collections import namedtuple, OrderedDict, defaultdict import six from six.moves import zip -from six.moves.collections_abc import Hashable +from six.moves.collections_abc import Hashable # pylint:disable-all from sortedcontainers import SortedSet import acl diff --git a/sandbox/grist/test_match_counter.py b/sandbox/grist/test_match_counter.py index 9e2ba882..8b3f9a98 100644 --- a/sandbox/grist/test_match_counter.py +++ b/sandbox/grist/test_match_counter.py @@ -5,7 +5,7 @@ import unittest import six from six.moves import xrange -from six.moves.collections_abc import Hashable +from six.moves.collections_abc import Hashable # pylint:disable-all import match_counter from testutil import repeat_until_passes