Merge branch 'master' of github.com:micropython/micropython

2 files changed, 12 insertions, 9 deletions

diff --git a/py/builtinimport.c b/py/builtinimport.c
index 3f63768ad4..262ee04a53 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -292,11 +292,10 @@ mp_obj_t mp_builtin___import__(uint n_args, mp_obj_t *args) {
                     vstr_add_str(&path, "__init__.py");
                     if (mp_import_stat(vstr_str(&path)) != MP_IMPORT_STAT_FILE) {
                         vstr_cut_tail_bytes(&path, sizeof("/__init__.py") - 1); // cut off /__init__.py
-                        nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ImportError,
-                            "Per PEP-420 a dir without __init__.py (%s) is a namespace package; "
-                            "namespace packages are not supported", vstr_str(&path)));
+                        printf("Notice: %s is imported as namespace package\n", vstr_str(&path));
+                    } else {
+                        do_load(module_obj, &path);
                     }
-                    do_load(module_obj, &path);
                     vstr_cut_tail_bytes(&path, sizeof("/__init__.py") - 1); // cut off /__init__.py
                     // https://docs.python.org/3.3/reference/import.html
                     // "Specifically, any module that contains a __path__ attribute is considered a package."
diff --git a/py/objtype.c b/py/objtype.c
index c1749ff5f3..198f76746a 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -309,16 +309,20 @@ STATIC bool class_store_attr(mp_obj_t self_in, qstr attr, mp_obj_t value) {
 }
 
 bool class_store_item(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
+    mp_obj_class_t *self = self_in;
+    mp_obj_t member;
+    uint meth_args;
     if (value == MP_OBJ_NULL) {
         // delete item
-        // TODO implement me!
-        return false;
+        member = mp_obj_class_lookup(self->base.type, MP_QSTR___delitem__);
+        meth_args = 2;
+    } else {
+        member = mp_obj_class_lookup(self->base.type, MP_QSTR___setitem__);
+        meth_args = 3;
     }
-    mp_obj_class_t *self = self_in;
-    mp_obj_t member = mp_obj_class_lookup(self->base.type, MP_QSTR___setitem__);
     if (member != MP_OBJ_NULL) {
         mp_obj_t args[3] = {self_in, index, value};
-        mp_call_function_n_kw(member, 3, 0, args);
+        mp_call_function_n_kw(member, meth_args, 0, args);
         return true;
     } else {
         return false;