Merge branch 'main' into philippe/fix/58

Author: philippedistributive

src/JSObjectProxy.cc

@@ -70,7 +70,7 @@ int JSObjectProxyMethodDefinitions::JSObjectProxy_init(JSObjectProxy *self, PyOb
 Py_ssize_t JSObjectProxyMethodDefinitions::JSObjectProxy_length(JSObjectProxy *self)
 {
   JS::RootedIdVector props(GLOBAL_CX);
-  if (!js::GetPropertyKeys(GLOBAL_CX, self->jsObject, JSITER_OWNONLY | JSITER_HIDDEN, &props))
+  if (!js::GetPropertyKeys(GLOBAL_CX, self->jsObject, JSITER_OWNONLY, &props))
   {
     // @TODO (Caleb Aikens) raise exception here
     return -1;
@@ -179,7 +179,7 @@ bool JSObjectProxyMethodDefinitions::JSObjectProxy_richcompare_helper(JSObjectPr
   }
 
   JS::RootedIdVector props(GLOBAL_CX);
-  if (!js::GetPropertyKeys(GLOBAL_CX, self->jsObject, JSITER_OWNONLY | JSITER_HIDDEN, &props))
+  if (!js::GetPropertyKeys(GLOBAL_CX, self->jsObject, JSITER_OWNONLY, &props))
   {
     // @TODO (Caleb Aikens) raise exception here
     return NULL;

tests/python/test_dict_methods.py

@@ -434,7 +434,7 @@ def test_items_len():
 #    items = dishes.items()
 #    assert {('eggs', 2)} in items
 
-def test_values_update_object_updates_the_items():
+def test_items_update_object_updates_the_items():
     employee = pm.eval("({'name': 'Phil', 'age': 22})")
     dictionaryItems = employee.items()
     employee.update({('salary', 3500.0)})

tests/python/test_pythonmonkey_eval.py

@@ -286,3 +286,7 @@ def concatenate(a, b):
             codepoint = random.randint(0x0000, 0xFFFF)
             string2 += chr(codepoint)
         assert caller(concatenate, string1, string2) == string1 + string2
+
+def test_globalThis():
+    obj = pm.eval('globalThis')
+    assert str(obj).__contains__("{'python': {'pythonMonkey':")