attrwrapper.update(iterable)

src/runtime/dict.h

@@ -58,6 +58,7 @@ Box* dictViewKeysIter(Box* self);
 Box* dictViewValuesIter(Box* self);
 Box* dictViewItemsIter(Box* self);
 void dictMerge(BoxedDict* self, Box* other);
+Box* dictUpdate(BoxedDict* self, BoxedTuple* args, BoxedDict* kwargs);
 }
 
 #endif

src/runtime/types.cpp

@@ -31,6 +31,7 @@
 #include "gc/collector.h"
 #include "runtime/capi.h"
 #include "runtime/classobj.h"
+#include "runtime/dict.h"
 #include "runtime/file.h"
 #include "runtime/ics.h"
 #include "runtime/iterobject.h"
@@ -1541,14 +1542,21 @@ public:
                 for (const auto& p : attrs->hcls->getStrAttrOffsets()) {
                     self->b->setattr(p.first(), attrs->attr_list->attrs[p.second], NULL);
                 }
-            } else if (_container->cls == dict_cls) {
+            } else {
+                // The update rules are too complicated to be worth duplicating here;
+                // just create a new dict object and defer to dictUpdate.
+                // Hopefully this does not happen very often.
+                if (!isSubclass(_container->cls, dict_cls)) {
+                    BoxedDict* new_container = new BoxedDict();
+                    dictUpdate(new_container, BoxedTuple::create({ _container }), new BoxedDict());
+                    _container = new_container;
+                }
+                assert(isSubclass(_container->cls, dict_cls));
                 BoxedDict* container = static_cast<BoxedDict*>(_container);
 
                 for (const auto& p : container->d) {
                     AttrWrapper::setitem(self, p.first, p.second);
                 }
-            } else {
-                RELEASE_ASSERT(0, "not implemented: %s", _container->cls->tp_name);
             }
         };
 

test/tests/dir.py

@@ -110,3 +110,7 @@ class TestClass3: # old-style
 
 print sorted([d for d in dir(TestClass3) if not d.startswith('_')])
 print sorted([d for d in dir(TestClass3()) if not d.startswith('_')])
+
+c = C1()
+c.__dict__.update([('a', 1), ('b', 2)])
+print c.a, c.b