tuple -> Tuple[Any, ...]; move isinstance check to literal module; re…

…name to _Hasher
python · JukkaL · Aug 30, 2017 · Mar 28, 2017 · Mar 28, 2017 · Mar 28, 2017
commit dd4428815e2232d01a79bd26e59249d901fcd07d
diff --git a/mypy/binder.py b/mypy/binder.py
@@ -6,7 +6,7 @@
 from mypy.join import join_simple
 from mypy.sametypes import is_same_type
 from mypy.nodes import Expression, Var, RefExpr
-from mypy.literals import Key, literal, literal_hash
+from mypy.literals import Key, literal, literal_hash, subkeys
 from mypy.nodes import IndexExpr, MemberExpr, NameExpr
 
 
@@ -93,9 +93,8 @@ def _add_dependencies(self, key: Key, value: Optional[Key] = None) -> None:
             value = key
         else:
             self.dependencies.setdefault(key, set()).add(value)
-        for elt in key:
-            if isinstance(elt, Key):
-                self._add_dependencies(elt, value)
+        for elt in subkeys(key):
+            self._add_dependencies(elt, value)
 
     def push_frame(self) -> Frame:
         """Push a new frame into the binder."""

diff --git a/mypy/literals.py b/mypy/literals.py
@@ -1,4 +1,4 @@
-from typing import Optional, Union, Any, Tuple
+from typing import Optional, Union, Any, Tuple, Iterable
 
 from mypy.nodes import (
     Expression, ComparisonExpr, OpExpr, MemberExpr, UnaryExpr, StarExpr, IndexExpr, LITERAL_YES,
@@ -78,14 +78,18 @@ def literal(e: Expression) -> int:
     return LITERAL_NO
 
 
-Key = tuple
+Key = Tuple[Any, ...]
+
+
+def subkeys(key: Key) -> Iterable[Key]:
+    return [elt for elt in key if isinstance(elt, tuple)]
 
 
 def literal_hash(e: Expression) -> Optional[Key]:
     return e.accept(_hasher)
 
 
-class Hasher(ExpressionVisitor[Optional[Key]]):
+class _Hasher(ExpressionVisitor[Optional[Key]]):
     def visit_int_expr(self, e: IntExpr) -> Key:
         return ('Literal', e.value)
 
@@ -226,4 +230,4 @@ def visit_temp_node(self, e: TempNode) -> None:
         return None
 
 
-_hasher = Hasher()
+_hasher = _Hasher()