py: Make sure getattr() works with non-interned strings (by interning them).

pfalcon · pfalcon · commit b4efac14cde7 · 2014-06-08T01:15:06.000+03:00
diff --git a/py/builtin.c b/py/builtin.c
@@ -452,12 +452,17 @@ STATIC inline mp_obj_t mp_load_attr_default(mp_obj_t base, qstr attr, mp_obj_t d
 }
 
 STATIC mp_obj_t mp_builtin_getattr(uint n_args, const mp_obj_t *args) {
-    assert(MP_OBJ_IS_QSTR(args[1]));
+    mp_obj_t attr = args[1];
+    if (MP_OBJ_IS_TYPE(attr, &mp_type_str)) {
+        attr = mp_obj_str_intern(attr);
+    } else if (!MP_OBJ_IS_QSTR(attr)) {
+        nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "string required"));
+    }
     mp_obj_t defval = MP_OBJ_NULL;
     if (n_args > 2) {
         defval = args[2];
     }
-    return mp_load_attr_default(args[0], MP_OBJ_QSTR_VALUE(args[1]), defval);
+    return mp_load_attr_default(args[0], MP_OBJ_QSTR_VALUE(attr), defval);
 }
 
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_getattr_obj, 2, 3, mp_builtin_getattr);
diff --git a/py/obj.h b/py/obj.h
@@ -468,6 +468,7 @@ uint mp_obj_str_get_len(mp_obj_t self_in);
 qstr mp_obj_str_get_qstr(mp_obj_t self_in); // use this if you will anyway convert the string to a qstr
 const char *mp_obj_str_get_str(mp_obj_t self_in); // use this only if you need the string to be null terminated
 const char *mp_obj_str_get_data(mp_obj_t self_in, uint *len);
+mp_obj_t mp_obj_str_intern(mp_obj_t str);
 void mp_str_print_quoted(void (*print)(void *env, const char *fmt, ...), void *env, const byte *str_data, uint str_len);
 
 #if MICROPY_PY_BUILTINS_FLOAT
diff --git a/py/objstr.c b/py/objstr.c
@@ -1751,6 +1751,11 @@ mp_obj_t mp_obj_new_str(const char* data, uint len, bool make_qstr_if_not_alread
     }
 }
 
+mp_obj_t mp_obj_str_intern(mp_obj_t str) {
+    GET_STR_DATA_LEN(str, data, len);
+    return MP_OBJ_NEW_QSTR(qstr_from_strn((const char*)data, len));
+}
+
 mp_obj_t mp_obj_new_bytes(const byte* data, uint len) {
     return mp_obj_new_str_of_type(&mp_type_bytes, data, len);
 }
diff --git a/tests/basics/getattr1.py b/tests/basics/getattr1.py
@@ -15,3 +15,4 @@ def meth(self, i):
 print(getattr(a, "meth")(5))
 print(getattr(a, "_none_such", 123))
 print(getattr(list, "foo", 456))
+print(getattr(a, "va" + "r2"))

Original file line number	Diff line number	Diff line change
`@@ -452,12 +452,17 @@ STATIC inline mp_obj_t mp_load_attr_default(mp_obj_t base, qstr attr, mp_obj_t d`
`452`	`452`	`}`
`453`	`453`
`454`	`454`	`STATIC mp_obj_t mp_builtin_getattr(uint n_args, const mp_obj_t *args) {`
`455`		`- assert(MP_OBJ_IS_QSTR(args[1]));`
	`455`	`+ mp_obj_t attr = args[1];`
	`456`	`+ if (MP_OBJ_IS_TYPE(attr, &mp_type_str)) {`
	`457`	`+ attr = mp_obj_str_intern(attr);`
	`458`	`+ } else if (!MP_OBJ_IS_QSTR(attr)) {`
	`459`	`+ nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "string required"));`
	`460`	`+ }`
`456`	`461`	`mp_obj_t defval = MP_OBJ_NULL;`
`457`	`462`	`if (n_args > 2) {`
`458`	`463`	`defval = args[2];`
`459`	`464`	`}`
`460`		`- return mp_load_attr_default(args[0], MP_OBJ_QSTR_VALUE(args[1]), defval);`
	`465`	`+ return mp_load_attr_default(args[0], MP_OBJ_QSTR_VALUE(attr), defval);`
`461`	`466`	`}`
`462`	`467`
`463`	`468`	`MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_getattr_obj, 2, 3, mp_builtin_getattr);`
Original file line number	Diff line number	Diff line change
`@@ -1751,6 +1751,11 @@ mp_obj_t mp_obj_new_str(const char* data, uint len, bool make_qstr_if_not_alread`
`1751`	`1751`	`}`
`1752`	`1752`	`}`
`1753`	`1753`
	`1754`	`+mp_obj_t mp_obj_str_intern(mp_obj_t str) {`
	`1755`	`+ GET_STR_DATA_LEN(str, data, len);`
	`1756`	`+ return MP_OBJ_NEW_QSTR(qstr_from_strn((const char*)data, len));`
	`1757`	`+}`
	`1758`	`+`
`1754`	`1759`	`mp_obj_t mp_obj_new_bytes(const byte* data, uint len) {`
`1755`	`1760`	`return mp_obj_new_str_of_type(&mp_type_bytes, data, len);`
`1756`	`1761`	`}`