Merge 4861d81 into d80d791

promise/dataloader.py

@@ -1,4 +1,8 @@
-from collections import Iterable, namedtuple
+from collections import namedtuple
+try:
+    from collections.abc import Iterable
+except ImportError:
+    from collections import Iterable
 from functools import partial
 
 from .promise import Promise, async_instance, get_default_scheduler
@@ -67,16 +71,12 @@ def __init__(
         if cache is not None:
             self.cache = cache
 
-        if get_cache_key is not None:
-            self.get_cache_key = get_cache_key
+        self.get_cache_key = get_cache_key or (lambda x: x)
 
         self._promise_cache = cache_map or {}
         self._queue = []  # type: List[Loader]
         self._scheduler = scheduler
 
-    def get_cache_key(self, key):  # type: ignore
-        return key
-
     def load(self, key=None):
         # type: (Hashable) -> Promise
         """

promise/promise.py

@@ -319,7 +319,7 @@ def _settle_promise(
                 if async_guaranteed:
                     promise._is_async_guaranteed = True  # type: ignore
                 self._settle_promise_from_handler(  # type: ignore
-                    handler, value, promise
+                    handler, value, promise  # type: ignore
                 )  # type: ignore
         elif is_promise:
             if async_guaranteed:
@@ -567,7 +567,7 @@ def _then(
         did_reject=None,  # type: Optional[Callable[[Exception], S]]
     ):
         # type: (...) -> Promise[S]
-        promise = self.__class__()
+        promise = self.__class__()  # type: Promise
         target = self._target()
 
         state = target._state

promise/promise_list.py

@@ -1,5 +1,8 @@
 from functools import partial
-from collections import Iterable
+try:
+    from collections.abc import Iterable
+except ImportError:
+    from collections import Iterable
 
 if False:
     from .promise import Promise