Fix spurious not-callable error for typing.OrderedDict.

I also added a __repr__ for AnnotationContainer because the fact that it was
using the __repr__ of the AnnotationClass base class initially threw off my
debugging attempts.

Resolves #1196.

PiperOrigin-RevId: 446039108

Author: rchen152

pytype/abstract/_instance_base.py

@@ -9,6 +9,7 @@
 from pytype.abstract import function
 
 log = logging.getLogger(__name__)
+_isinstance = abstract_utils._isinstance  # pylint: disable=protected-access
 
 
 class SimpleValue(_base.BaseValue):
@@ -99,15 +100,18 @@ def merge_instance_type_parameter(self, node, name, value):
     else:
       self.instance_type_parameters[name] = value
 
-  def call(self, node, func, args, alias_map=None):
-    binding = func if self == func.data else self.to_binding(node)
+  def _call_helper(self, node, obj, binding, args):
+    obj_binding = binding if obj == binding.data else obj.to_binding(node)
     node, var = self.ctx.attribute_handler.get_attribute(
-        node, self, "__call__", binding)
+        node, obj, "__call__", obj_binding)
     if var is not None and var.bindings:
       return function.call_function(self.ctx, node, var, args)
     else:
       raise function.NotCallable(self)
 
+  def call(self, node, func, args, alias_map=None):
+    return self._call_helper(node, self, func, args)
+
   def argcount(self, node):
     node, var = self.ctx.attribute_handler.get_attribute(
         node, self, "__call__", self.to_binding(node))

pytype/abstract/_typing.py

@@ -75,6 +75,9 @@ def __init__(self, name, ctx, base_cls):
     super().__init__(name, ctx)
     self.base_cls = base_cls
 
+  def __repr__(self):
+    return "AnnotationContainer(%s)" % self.name
+
   def _sub_annotation(
       self, annot: _base.BaseValue, subst: Mapping[str, _base.BaseValue]
   ) -> _base.BaseValue:
@@ -300,6 +303,9 @@ def _build_value(self, node, inner, ellipses):
       self.ctx.errorlog.invalid_annotation(self.ctx.vm.frames, e.annot, e.error)
       return self.ctx.convert.unsolvable
 
+  def call(self, node, func, args, alias_map=None):
+    return self._call_helper(node, self.base_cls, func, args)
+
 
 class TypeParameter(_base.BaseValue):
   """Parameter of a type."""

pytype/tests/test_errors2.py

@@ -66,10 +66,10 @@ def f(x: str):
   def test_wrong_brackets(self):
     _, errors = self.InferWithErrors("""
       from typing import List
-      def f(x: List(str)):  # not-callable[e]
+      def f(x: List(str)):  # invalid-annotation[e]
         pass
     """)
-    self.assertErrorSequences(errors, {"e": ["List"]})
+    self.assertErrorSequences(errors, {"e": ["<instance of list>"]})
 
   def test_interpreter_class_printing(self):
     _, errors = self.InferWithErrors("""

pytype/tests/test_typing2.py

@@ -761,6 +761,12 @@ def f(x: OrderedDict[str, int]): ...
       f(collections.OrderedDict(a=0))
     """)
 
+  def test_instantiate_ordered_dict(self):
+    self.Check("""
+      from typing import OrderedDict
+      OrderedDict()
+    """)
+
   def test_typed_dict(self):
     with file_utils.Tempdir() as d:
       d.create_file("foo.pyi", """