allow object key to shadow method

Author: philippedistributive

src/JSObjectProxy.cc

@@ -111,7 +111,14 @@ static inline PyObject *getKey(JSObjectProxy *self, PyObject *key, JS::HandleId
     }
     else {
       if (strcmp(methodName, PyUnicode_AsUTF8(key)) == 0) {
-        return PyObject_GenericGetAttr((PyObject *)self, key);
+        // just make sure no property is shadowing a method by name
+        JS::RootedValue value(GLOBAL_CX);
+        JS_GetPropertyById(GLOBAL_CX, *(self->jsObject), id, &value);
+        if (!value.isUndefined()) {
+          return pyTypeFactory(GLOBAL_CX, value)->getPyObject();
+        } else {
+          return PyObject_GenericGetAttr((PyObject *)self, key);
+        }
       }
     }
   }

tests/python/test_dict_methods.py

@@ -448,4 +448,10 @@ def test_items_mapping():
 #get method
 def test_get_method():     
     dishes = pm.eval("({'eggs': 2, 'sausage': 1, 'bacon': 1, 'spam': 500})")
-    assert dishes.get('eggs') == 2
+    assert dishes.get('eggs') == 2
+
+#get method shadowing
+def test_method_shadowing():
+    jsObj = pm.eval("({get: 'value'})")
+    assert jsObj.get == 'value'
+    assert jsObj['get'] == 'value'