diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-05-21 20:35:02 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-05-21 20:35:02 +0100 |
| commit | 90886807a1a4d60cef0882ae6b057a652bfdc7af (patch) | |
| tree | 398d3da46c46ed22e17c87354f645acd916f96f0 /py/objobject.c | |
| parent | 58ebde46646dd49d22b2accfa9c7a78e15921e48 (diff) | |
| parent | a8408a8abe83c98af50821f1eb1df53cf9d202dd (diff) | |
| download | micropython-90886807a1a4d60cef0882ae6b057a652bfdc7af.tar.gz micropython-90886807a1a4d60cef0882ae6b057a652bfdc7af.zip | |
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py/objobject.c')
| -rw-r--r-- | py/objobject.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/py/objobject.c b/py/objobject.c index 6a1393076d..db4fb689cb 100644 --- a/py/objobject.c +++ b/py/objobject.c @@ -47,8 +47,24 @@ STATIC mp_obj_t object_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const return o; } +#if MICROPY_CPYTHON_COMPAT +STATIC mp_obj_t object___init__(uint n_args, const mp_obj_t *args) { + return mp_const_none; +} +STATIC MP_DEFINE_CONST_FUN_OBJ_1(object___init___obj, object___init__); +#endif + +STATIC const mp_map_elem_t object_locals_dict_table[] = { + #if MICROPY_CPYTHON_COMPAT + { MP_OBJ_NEW_QSTR(MP_QSTR___init__), (mp_obj_t)&object___init___obj }, + #endif +}; + +STATIC MP_DEFINE_CONST_DICT(object_locals_dict, object_locals_dict_table); + const mp_obj_type_t mp_type_object = { { &mp_type_type }, .name = MP_QSTR_object, .make_new = object_make_new, + .locals_dict = (mp_obj_t)&object_locals_dict, }; |