Only set mp_subscript and mp_ass_subscript for indexable types

danabr · lostmsu · commit f808166ce2dd · 2020-10-06T10:38:53.000-07:00
diff --git a/src/runtime/typemanager.cs b/src/runtime/typemanager.cs
@@ -171,6 +171,28 @@ internal static IntPtr CreateType(ManagedType impl, Type clrType)
                 Marshal.WriteIntPtr(type, TypeOffset.tp_iter, IntPtr.Zero);
             }
 
+
+            // Only set mp_subscript and mp_ass_subscript for types with indexers
+            if (impl is ClassBase cb)
+            {
+                if (!(impl is ArrayObject))
+                {
+                    if (cb.indexer == null || !cb.indexer.CanGet)
+                    {
+                        Marshal.WriteIntPtr(type, TypeOffset.mp_subscript, IntPtr.Zero);
+                    }
+                    if (cb.indexer == null || !cb.indexer.CanSet)
+                    {
+                        Marshal.WriteIntPtr(type, TypeOffset.mp_ass_subscript, IntPtr.Zero);
+                    }
+                }
+            }
+            else
+            {
+                Marshal.WriteIntPtr(type, TypeOffset.mp_subscript, IntPtr.Zero);
+                Marshal.WriteIntPtr(type, TypeOffset.mp_ass_subscript, IntPtr.Zero);
+            }
+
             if (base_ != IntPtr.Zero)
             {
                 Marshal.WriteIntPtr(type, TypeOffset.tp_base, base_);
diff --git a/src/tests/test_array.py b/src/tests/test_array.py
@@ -1321,16 +1321,14 @@ def test_array_abuse():
     with pytest.raises(TypeError):
         Test.PublicArrayTest.__getitem__(0, 0)
 
-    with pytest.raises(TypeError):
+    with pytest.raises(AttributeError):
         Test.PublicArrayTest.__setitem__(0, 0, 0)
 
-    with pytest.raises(TypeError):
-        desc = Test.PublicArrayTest.__dict__['__getitem__']
-        desc(0, 0)
+    with pytest.raises(KeyError):
+        Test.PublicArrayTest.__dict__['__getitem__']
 
-    with pytest.raises(TypeError):
-        desc = Test.PublicArrayTest.__dict__['__setitem__']
-        desc(0, 0, 0)
+    with pytest.raises(KeyError):
+        Test.PublicArrayTest.__dict__['__setitem__']
 
 
 def test_iterator_to_array():
diff --git a/src/tests/test_indexer.py b/src/tests/test_indexer.py
@@ -42,7 +42,7 @@ def test_internal_indexer():
     with pytest.raises(TypeError):
         Test.InternalIndexerTest.__getitem__(ob, 0)
 
-    with pytest.raises(TypeError):
+    with pytest.raises(AttributeError):
         ob.__getitem__(0)
 
 
@@ -56,7 +56,7 @@ def test_private_indexer():
     with pytest.raises(TypeError):
         Test.PrivateIndexerTest.__getitem__(ob, 0)
 
-    with pytest.raises(TypeError):
+    with pytest.raises(AttributeError):
         ob.__getitem__(0)
 
 
@@ -603,3 +603,14 @@ def test_indexer_accessed_through_interface():
     d = IDictionary[str, str](Dictionary[str, str]())
     d["one"] = "1"
     assert d["one"] == "1"
+
+
+def test_using_indexer_on_object_without_indexer():
+    """Test using subscript syntax on an object an without indexer raises"""
+    from System import Object
+    o = Object()
+    with pytest.raises(TypeError):
+        o[0]
+
+    with pytest.raises(TypeError):
+        o[0] = 1
