From 08cbdf29f5d2e48bf54ac98e1a09b2c49167be1e Mon Sep 17 00:00:00 2001 From: Karthikeyan Singaravelan Date: Sat, 19 Feb 2022 05:31:05 +0000 Subject: [PATCH] Import ABC through six.moves for Python 2/3 compatibility. --- sandbox/grist/engine.py | 3 ++- sandbox/grist/test_match_counter.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sandbox/grist/engine.py b/sandbox/grist/engine.py index 039454b0..35a3e916 100644 --- a/sandbox/grist/engine.py +++ b/sandbox/grist/engine.py @@ -10,10 +10,11 @@ import rlcompleter import sys import time import traceback -from collections import namedtuple, OrderedDict, Hashable, defaultdict +from collections import namedtuple, OrderedDict, defaultdict import six from six.moves import zip +from six.moves.collections_abc import Hashable from sortedcontainers import SortedSet import acl diff --git a/sandbox/grist/test_match_counter.py b/sandbox/grist/test_match_counter.py index b84ca7b0..9e2ba882 100644 --- a/sandbox/grist/test_match_counter.py +++ b/sandbox/grist/test_match_counter.py @@ -2,10 +2,10 @@ import random import string import timeit import unittest -from collections import Hashable import six from six.moves import xrange +from six.moves.collections_abc import Hashable import match_counter from testutil import repeat_until_passes