@@ -49,7 +49,7 @@ async def async_call_service(self, method_name, *args, **kwargs):
49
49
await self .widget .wait_for_change ('counter' , self .output )
50
50
except Exception as e :
51
51
return e
52
- return self .widget .response
52
+ return self .widget .response [ "data" ]
53
53
54
54
55
55
def __getattr__ (self , method_name ):
@@ -73,7 +73,6 @@ class NaoRobotWidget(DOMWidget):
73
73
status = Unicode ("Not busy" ).tag (sync = True )
74
74
counter = Integer (0 ).tag (sync = True )
75
75
response = None
76
- js_error = None
77
76
78
77
79
78
def __init__ (self , ** kwargs ):
@@ -83,26 +82,22 @@ def __init__(self, **kwargs):
83
82
84
83
def _handle_frontend_msg (self , model , msg , buffer ):
85
84
print ("Received frontend msg: " , msg )
86
- if (msg ["isError" ]):
87
- self .js_error = msg ["data" ]
88
- else :
89
- self .response = msg ["data" ]
85
+ self .response = msg
90
86
91
87
92
88
def wait_for_change (widget , value_name , output = Output ()):
93
89
future = asyncio .Future ()
94
90
widget .response = None
95
- widget .js_error = None
96
91
97
92
def get_value_change (change ):
98
93
widget .unobserve (get_value_change , names = value_name )
99
- if (widget .response != None or widget . js_error != None ):
100
- if (widget .js_error ):
101
- future .set_exception (Exception (widget .js_error ))
102
- output .append_stderr (widget .js_error )
94
+ if (widget .response != None ):
95
+ if (widget .response [ "isError" ] ):
96
+ future .set_exception (Exception (widget .response [ "data" ] ))
97
+ output .append_stderr (widget .response [ "data" ] )
103
98
else :
104
- future .set_result (widget .response )
105
- output .append_stdout (widget .response )
99
+ future .set_result (widget .response [ "data" ] )
100
+ output .append_stdout (widget .response [ "data" ] )
106
101
else :
107
102
future .set_result (change )
108
103
0 commit comments