summaryrefslogtreecommitdiffstatshomepage
path: root/py/runtime.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-01-07 15:42:16 -0800
committerDamien George <damien.p.george@gmail.com>2014-01-07 15:42:16 -0800
commit6d6bc9efc17c0fd4f28f935280db6d8dee100d4f (patch)
treed1be037346e6e2c4844e83f5435771eaf2670208 /py/runtime.c
parentdfc0bac086a0277cc1c3d6a72ee906214bbbf9ac (diff)
parentbaa665406fef58cfb0be0df8d2798ed0961506da (diff)
downloadmicropython-6d6bc9efc17c0fd4f28f935280db6d8dee100d4f.tar.gz
micropython-6d6bc9efc17c0fd4f28f935280db6d8dee100d4f.zip
Merge pull request #108 from chipaca/dict_feats
Dictionary features that don't involve views or classmethods. First part of issue #99.
Diffstat (limited to 'py/runtime.c')
-rw-r--r--py/runtime.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/py/runtime.c b/py/runtime.c
index 962d539c04..5c476d9ecf 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -879,13 +879,13 @@ mp_obj_t rt_getiter(mp_obj_t o_in) {
mp_obj_t rt_iternext(mp_obj_t o_in) {
if (MP_OBJ_IS_SMALL_INT(o_in)) {
- nlr_jump(mp_obj_new_exception_msg(MP_QSTR_TypeError, "? 'int' object is not iterable"));
+ nlr_jump(mp_obj_new_exception_msg(MP_QSTR_TypeError, "'int' object is not an iterator"));
} else {
mp_obj_base_t *o = o_in;
if (o->type->iternext != NULL) {
return o->type->iternext(o_in);
} else {
- nlr_jump(mp_obj_new_exception_msg_1_arg(MP_QSTR_TypeError, "? '%s' object is not iterable", o->type->name));
+ nlr_jump(mp_obj_new_exception_msg_1_arg(MP_QSTR_TypeError, "'%s' object is not an iterator", o->type->name));
}
}
}