(core) updates from grist-core

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

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