py: Change namedtuple error messages to reduce code size.

dpgeorge · dpgeorge · commit 84e0cf0d215d · 2015-01-01T15:43:25.000Z
We are not word-for-word compatible with CPython exceptions, so we are
free to make them short but informative in order to reduce code size.
Also, try to make messages the same as existing ones where possible.
diff --git a/py/objnamedtuple.c b/py/objnamedtuple.c
@@ -89,11 +89,14 @@ STATIC mp_obj_t namedtuple_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_
     if (n_args + n_kw != num_fields) {
         if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
             mp_arg_error_terse_mismatch();
-        } else {
-            // Counts include implicit "self"
+        } else if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NORMAL) {
             nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
-                "__new__() takes %d positional arguments but %d were given",
-                num_fields + 1, n_args + n_kw + 1));
+                "function takes %d positional arguments but %d were given",
+                num_fields, n_args + n_kw));
+        } else if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED) {
+            nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
+                "%s() takes %d positional arguments but %d were given",
+                qstr_str(type->base.name), num_fields, n_args + n_kw));
         }
     }
 
@@ -117,7 +120,7 @@ STATIC mp_obj_t namedtuple_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_
                     mp_arg_error_terse_mismatch();
                 } else {
                     nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
-                        "__new__() got an unexpected keyword argument '%s'",
+                        "unexpected keyword argument '%s'",
                         qstr_str(kw)));
                 }
             }
@@ -126,7 +129,7 @@ STATIC mp_obj_t namedtuple_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_
                     mp_arg_error_terse_mismatch();
                 } else {
                     nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
-                        "__new__() got multiple values for argument '%s'",
+                        "function got multiple values for argument '%s'",
                         qstr_str(kw)));
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -89,11 +89,14 @@ STATIC mp_obj_t namedtuple_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_`
`89`	`89`	`if (n_args + n_kw != num_fields) {`
`90`	`90`	`if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {`
`91`	`91`	`mp_arg_error_terse_mismatch();`
`92`		`- } else {`
`93`		`- // Counts include implicit "self"`
	`92`	`+ } else if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NORMAL) {`
`94`	`93`	`nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,`
`95`		`- "__new__() takes %d positional arguments but %d were given",`
`96`		`- num_fields + 1, n_args + n_kw + 1));`
	`94`	`+ "function takes %d positional arguments but %d were given",`
	`95`	`+ num_fields, n_args + n_kw));`
	`96`	`+ } else if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED) {`
	`97`	`+ nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,`
	`98`	`+ "%s() takes %d positional arguments but %d were given",`
	`99`	`+ qstr_str(type->base.name), num_fields, n_args + n_kw));`
`97`	`100`	`}`
`98`	`101`	`}`
`99`	`102`
`@@ -117,7 +120,7 @@ STATIC mp_obj_t namedtuple_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_`
`117`	`120`	`mp_arg_error_terse_mismatch();`
`118`	`121`	`} else {`
`119`	`122`	`nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,`
`120`		`- "__new__() got an unexpected keyword argument '%s'",`
	`123`	`+ "unexpected keyword argument '%s'",`
`121`	`124`	`qstr_str(kw)));`
`122`	`125`	`}`
`123`	`126`	`}`
`@@ -126,7 +129,7 @@ STATIC mp_obj_t namedtuple_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_`
`126`	`129`	`mp_arg_error_terse_mismatch();`
`127`	`130`	`} else {`
`128`	`131`	`nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,`
`129`		`- "__new__() got multiple values for argument '%s'",`
	`132`	`+ "function got multiple values for argument '%s'",`
`130`	`133`	`qstr_str(kw)));`
`131`	`134`	`}`
`132`	`135`	`}`