TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

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

Browse Source 
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
This commit is contained in:
John R. Lenton
2014-01-07 18:01:08 +00:00
parent c06763a020 fd04bb3bac
commit 270112f731
54 changed files with 2684 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
py/objtuple.c
View File

@@ -103,7 +103,6 @@ const mp_obj_type_t tuple_type = {
.make_new = tuple_make_new,
.binary_op = tuple_binary_op,
.getiter = tuple_getiter,
.methods = {{NULL, NULL},},
};
// the zero-length tuple
@@ -166,7 +165,6 @@ static const mp_obj_type_t tuple_it_type = {
.base = { &mp_const_type },
.name = "tuple_iterator",
.iternext = tuple_it_iternext,
.methods = {{NULL, NULL},},
};
static mp_obj_t mp_obj_new_tuple_iterator(mp_obj_tuple_t *tuple, int cur) {