Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
uPython-mirror
Commits
5f97aaec
Commit
5f97aaec
authored
Feb 08, 2015
by
Damien George
Browse files
py: Fix instance lookup, since object is not a real type.
parent
b5a790d2
Changes
1
Hide whitespace changes
Inline
Side-by-side
py/objtype.c
View file @
5f97aaec
...
...
@@ -133,7 +133,7 @@ STATIC void mp_obj_class_lookup(struct class_lookup_data *lookup, const mp_obj_
// not type where we found a class method.
const
mp_obj_type_t
*
org_type
=
(
const
mp_obj_type_t
*
)
lookup
->
obj
;
instance_convert_return_attr
(
NULL
,
org_type
,
elem
->
value
,
lookup
->
dest
);
}
else
if
(
lookup
->
obj
!=
MP_OBJ_NULL
&&
!
lookup
->
is_type
&&
is_native_type
(
type
))
{
}
else
if
(
lookup
->
obj
!=
MP_OBJ_NULL
&&
!
lookup
->
is_type
&&
is_native_type
(
type
)
&&
type
!=
&
mp_type_object
/* object is not a real type */
)
{
instance_convert_return_attr
(
lookup
->
obj
->
subobj
[
0
],
type
,
elem
->
value
,
lookup
->
dest
);
}
else
{
instance_convert_return_attr
(
lookup
->
obj
,
type
,
elem
->
value
,
lookup
->
dest
);
...
...
@@ -149,7 +149,7 @@ STATIC void mp_obj_class_lookup(struct class_lookup_data *lookup, const mp_obj_
// Try this for completeness, but all native methods should be statically defined
// in locals_dict, and would be handled by above.
if
(
lookup
->
obj
!=
MP_OBJ_NULL
&&
!
lookup
->
is_type
&&
is_native_type
(
type
))
{
if
(
lookup
->
obj
!=
MP_OBJ_NULL
&&
!
lookup
->
is_type
&&
is_native_type
(
type
)
&&
type
!=
&
mp_type_object
/* object is not a real type */
)
{
mp_load_method_maybe
(
lookup
->
obj
->
subobj
[
0
],
lookup
->
attr
,
lookup
->
dest
);
if
(
lookup
->
dest
[
0
]
!=
MP_OBJ_NULL
)
{
return
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment