Merge pull request #224 from Distributive-Network/philippe/fix/58

Philippe/fix/58

Author: philippedistributive

src/JSArrayProxy.cc

@@ -60,23 +60,17 @@ PyObject *JSArrayProxyMethodDefinitions::JSArrayProxy_get(JSArrayProxy *self, Py
   // look through the methods for dispatch and return key if no method found
   for (size_t index = 0;; index++) {
     const char *methodName = JSArrayProxyType.tp_methods[index].ml_name;
-    if (methodName == NULL) {   // reached end of list
+    if (methodName == NULL || !PyUnicode_Check(key)) {   // reached end of list
       JS::RootedValue *value = new JS::RootedValue(GLOBAL_CX);
       JS_GetPropertyById(GLOBAL_CX, self->jsArray, id, value);
-      JS::RootedObject *global = new JS::RootedObject(GLOBAL_CX, JS::GetNonCCWObjectGlobal(self->jsArray));
-      return pyTypeFactory(GLOBAL_CX, global, value)->getPyObject();
+      JS::RootedObject *thisObj = new JS::RootedObject(GLOBAL_CX, self->jsArray);
+      return pyTypeFactory(GLOBAL_CX, thisObj, value)->getPyObject();
     }
-    else if (PyUnicode_Check(key)) {
+    else {
       if (strcmp(methodName, PyUnicode_AsUTF8(key)) == 0) {
         return PyObject_GenericGetAttr((PyObject *)self, key);
       }
     }
-    else {
-      JS::RootedValue *value = new JS::RootedValue(GLOBAL_CX);
-      JS_GetPropertyById(GLOBAL_CX, self->jsArray, id, value);
-      JS::RootedObject *global = new JS::RootedObject(GLOBAL_CX, JS::GetNonCCWObjectGlobal(self->jsArray));
-      return pyTypeFactory(GLOBAL_CX, global, value)->getPyObject();
-    }
   }
 }
 

src/JSObjectProxy.cc

@@ -89,24 +89,17 @@ PyObject *JSObjectProxyMethodDefinitions::JSObjectProxy_get(JSObjectProxy *self,
   // look through the methods for dispatch
   for (size_t index = 0;; index++) {
     const char *methodName = JSObjectProxyType.tp_methods[index].ml_name;
-    if (methodName == NULL) { // reached end of list
+    if (methodName == NULL || !PyUnicode_Check(key)) {
       JS::RootedValue *value = new JS::RootedValue(GLOBAL_CX);
       JS_GetPropertyById(GLOBAL_CX, self->jsObject, id, value);
-      JS::RootedObject *global = new JS::RootedObject(GLOBAL_CX, JS::GetNonCCWObjectGlobal(self->jsObject));
-      return pyTypeFactory(GLOBAL_CX, global, value)->getPyObject();
+      JS::RootedObject *thisObj = new JS::RootedObject(GLOBAL_CX, self->jsObject);
+      return pyTypeFactory(GLOBAL_CX, thisObj, value)->getPyObject();
     }
-    else if (PyUnicode_Check(key)) {
+    else {
       if (strcmp(methodName, PyUnicode_AsUTF8(key)) == 0) {
         return PyObject_GenericGetAttr((PyObject *)self, key);
       }
     }
-    else {
-      JS::RootedValue *value = new JS::RootedValue(GLOBAL_CX);
-      JS_GetPropertyById(GLOBAL_CX, self->jsObject, id, value);
-      JS::RootedObject *global = new JS::RootedObject(GLOBAL_CX, JS::GetNonCCWObjectGlobal(self->jsObject));
-
-      return pyTypeFactory(GLOBAL_CX, global, value)->getPyObject();
-    }
   }
 }