Merge remote-tracking branch 'upstream/master' into listsort. Lots of conflict fun.

Conflicts:
	py/obj.h
	py/objbool.c
	py/objboundmeth.c
	py/objcell.c
	py/objclass.c
	py/objclosure.c
	py/objcomplex.c
	py/objdict.c
	py/objexcept.c
	py/objfun.c
	py/objgenerator.c
	py/objinstance.c
	py/objmodule.c
	py/objrange.c
	py/objset.c
	py/objslice.c

1 files changed, 4 insertions, 6 deletions

diff --git a/py/objrange.c b/py/objrange.c
index aba0fa768..a2a0e67b0 100644
--- a/py/objrange.c
+++ b/py/objrange.c
@@ -23,10 +23,9 @@ mp_obj_t range_getiter(mp_obj_t o_in) {
 }
 
 static const mp_obj_type_t range_type = {
-    .base = { &mp_const_type} ,
-    .name = "range",
+    { &mp_const_type} ,
+    "range",
     .getiter = range_getiter,
-    .methods = {{NULL, NULL},},
 };
 
 // range is a class and instances are immutable sequence objects
@@ -62,10 +61,9 @@ mp_obj_t range_it_iternext(mp_obj_t o_in) {
 }
 
 static const mp_obj_type_t range_it_type = {
-    .base = { &mp_const_type },
-    .name = "range_iterator",
+    { &mp_const_type },
+    "range_iterator",
     .iternext = range_it_iternext,
-    .methods = {{NULL, NULL},},
 };
 
 mp_obj_t mp_obj_new_range_iterator(int cur, int stop, int step) {