From 8a8308a3fce9096e580db4aab8b8b153e50a364c Mon Sep 17 00:00:00 2001 From: yumoqing Date: Wed, 19 Jan 2022 14:37:58 +0800 Subject: [PATCH] bugfix --- kivyblocks/baseWidget.py | 32 +- kivyblocks/blocks.c | 6510 ++++++++++++++++++---------------- kivyblocks/blocks.pyx | 31 +- kivyblocks/clickable.py | 8 +- kivyblocks/command_action.py | 56 + kivyblocks/dg.c | 110 +- kivyblocks/dg.pyx | 2 + kivyblocks/message.py | 139 +- kivyblocks/toolbar.py | 31 +- 9 files changed, 3626 insertions(+), 3293 deletions(-) create mode 100644 kivyblocks/command_action.py diff --git a/kivyblocks/baseWidget.py b/kivyblocks/baseWidget.py index 1c55924..ec6502a 100755 --- a/kivyblocks/baseWidget.py +++ b/kivyblocks/baseWidget.py @@ -2,7 +2,8 @@ import sys import math from traceback import print_exc -from kivy.properties import ObjectProperty, StringProperty +from kivy.properties import ObjectProperty, StringProperty, \ + NumericProperty, BooleanProperty from kivy.app import App from kivy.utils import platform from kivy.uix.button import Button, ButtonBehavior @@ -51,8 +52,7 @@ from kivy.uix.carousel import Carousel from kivy.uix.bubble import Bubble from kivy.uix.codeinput import CodeInput from kivy.graphics import Color, Rectangle -from kivy.properties import ListProperty -from kivycalendar import DatePicker +from kivy.properties import ListProperty, DictProperty from kivy.factory import Factory from appPublic.dictObject import DictObject @@ -221,17 +221,16 @@ class Title6(Text): kw.update({'texttype':'title6','bold':True}) Text.__init__(self, **kw) -class Modal(ModalView): - def __init__(self, auto_open=False, - content=None, - **kw): - ModalView.__init__(self, **kw) - self.auto_open = auto_open - if content: +class Modal(WidgetCSS, WidgetReady, ModalView): + content = DictProperty(None) + auto_open = BooleanProperty(True) + def __init__(self, **kw): + super(ModalView, self).__init__(**kw) + if self.content: blocks = Factory.Blocks() - self.content = blocks.widgetBuild(content) - if self.content: - self.add_widget(self.content) + self.content_w = blocks.widgetBuild(self.content) + if self.content_w: + self.add_widget(self.content_w) else: print(content,':cannot build widget') @@ -242,12 +241,15 @@ class Modal(ModalView): self.open() class TimedModal(Modal): - def __init__(self, show_time=5, **kw): - self.show_time = show_time + show_time = NumericProperty(0) + def __init__(self, **kw): self.time_task = None Modal.__init__(self, **kw) def open(self, *args, **kw): + if self.time_task is not None: + self.time_task.cancel() + self.time_task = None if self.show_time > 0: self.time_task = \ Clock.schedule_once(self.dismiss, self.show_time) diff --git a/kivyblocks/blocks.c b/kivyblocks/blocks.c index ef544dc..9448975 100644 --- a/kivyblocks/blocks.c +++ b/kivyblocks/blocks.c @@ -862,7 +862,7 @@ struct __pyx_defaults4 { PyObject *__pyx_arg_localnamespace; }; -/* "kivyblocks/blocks.pyx":406 +/* "kivyblocks/blocks.pyx":405 * return Blocks.getWidgetById(desc.get('target'),from_widget=widget) * * def blocksAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< @@ -875,12 +875,12 @@ struct __pyx_obj_10kivyblocks_6blocks___pyx_scope_struct__blocksAction { }; -/* "kivyblocks/blocks.pyx":431 +/* "kivyblocks/blocks.pyx":433 * b.widgetBuild(opts) * * def urlwidgetAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< - * target = self.get_target(widget, desc) - * add_mode = desc.get('mode','replace') + * Logger.info('Block: urlwidgetAction() called, desc=%s, args=%s', \ + * str(desc), */ struct __pyx_obj_10kivyblocks_6blocks___pyx_scope_struct_1_urlwidgetAction { PyObject_HEAD @@ -888,7 +888,7 @@ struct __pyx_obj_10kivyblocks_6blocks___pyx_scope_struct_1_urlwidgetAction { }; -/* "kivyblocks/blocks.pyx":597 +/* "kivyblocks/blocks.pyx":609 * alert('%s method not found' % method) * * def widgetBuild(self, desc): # <<<<<<<<<<<<<< @@ -901,7 +901,7 @@ struct __pyx_obj_10kivyblocks_6blocks___pyx_scope_struct_2_widgetBuild { }; -/* "kivyblocks/blocks.pyx":676 +/* "kivyblocks/blocks.pyx":688 * * @classmethod * def getWidgetById(self, id:str, from_widget:Widget=None) -> Widget: # <<<<<<<<<<<<<< @@ -1714,7 +1714,6 @@ static const char __pyx_k_http[] = "http://"; static const char __pyx_k_info[] = "info"; static const char __pyx_k_init[] = "__init__"; static const char __pyx_k_json[] = "json"; -static const char __pyx_k_kivy[] = "kivy"; static const char __pyx_k_list[] = "list"; static const char __pyx_k_main[] = "__main__"; static const char __pyx_k_mode[] = "mode"; @@ -1828,6 +1827,7 @@ static const char __pyx_k_Block_s_s[] = "Block: %s %s"; static const char __pyx_k_BoxViewer[] = "BoxViewer"; static const char __pyx_k_Exception[] = "Exception .... "; static const char __pyx_k_GlobalEnv[] = "GlobalEnv"; +static const char __pyx_k_ModalView[] = "ModalView"; static const char __pyx_k_action_id[] = "action_id"; static const char __pyx_k_boxViewer[] = "boxViewer"; static const char __pyx_k_buildBind[] = "buildBind"; @@ -1946,6 +1946,7 @@ static const char __pyx_k_Blocks_widgetBuild[] = "Blocks.widgetBuild"; static const char __pyx_k_SingletonDecorator[] = "SingletonDecorator"; static const char __pyx_k_WidgetNotFoundById[] = "WidgetNotFoundById"; static const char __pyx_k_cline_in_traceback[] = "cline_in_traceback"; +static const char __pyx_k_kivy_uix_modalview[] = "kivy.uix.modalview"; static const char __pyx_k_rfname_s_not_found[] = "rfname(%s) not found"; static const char __pyx_k_s_method_not_found[] = "%s method not found"; static const char __pyx_k_ArgumentError___str[] = "ArgumentError.__str__"; @@ -2003,6 +2004,7 @@ static const char __pyx_k_Blocks_registedfunctionAction[] = "Blocks.registedfunc static const char __pyx_k_Method_s_not_found_in_class_s[] = "Method(%s) not found in class(%s)"; static const char __pyx_k_Blocks_widgetBuild_locals_doit[] = "Blocks.widgetBuild..doit"; static const char __pyx_k_Block_desc_s_rfname_s_not_found[] = "Block: desc=%s rfname(%s) not found"; +static const char __pyx_k_Block_getActionData_desc_s_args[] = "Block: getActionData(): desc=%s args=%s"; static const char __pyx_k_Blocks_blocksAction_locals_doit[] = "Blocks.blocksAction..doit"; static const char __pyx_k_get_rtdata_method_return_is_not[] = "get_rtdata():method return is not dict"; static const char __pyx_k_Block2_desc_must_be_a_dict_objec[] = "Block2: desc must be a dict object"; @@ -2015,6 +2017,7 @@ static const char __pyx_k_Block_methodAction_desc_s_method[] = "Block: methodAct static const char __pyx_k_Block_methodAction_desc_s_target[] = "Block: methodAction():desc(%s) target not found"; static const char __pyx_k_Block_scriptAction_desc_s_target[] = "Block: scriptAction():desc(%s) target not found"; static const char __pyx_k_Block_uniaction_called_desc_s_ar[] = "Block: uniaction() called, desc=%s, args=%s"; +static const char __pyx_k_Block_urlwidgetAction_called_des[] = "Block: urlwidgetAction() called, desc=%s, args=%s"; static const char __pyx_k_Block_urlwidgetAction_desc_s_wid[] = "Block: urlwidgetAction(): desc=%s widgetBuild error"; static const char __pyx_k_Blocks_blocksAction_locals_doerr[] = "Blocks.blocksAction..doerr"; static const char __pyx_k_Blocks_getWidgetById_locals_find[] = "Blocks.getWidgetById..find_widget_by_id"; @@ -2037,12 +2040,14 @@ static PyObject *__pyx_kp_s_Block_desc_s_must_be_a_dict_obje; static PyObject *__pyx_kp_s_Block_desc_s_rfname_s_not_found; static PyObject *__pyx_kp_s_Block_eventAction_desc_s_miss_di; static PyObject *__pyx_kp_u_Block_eventAction_dispatch; +static PyObject *__pyx_kp_s_Block_getActionData_desc_s_args; static PyObject *__pyx_kp_s_Block_get_a_null_function_s; static PyObject *__pyx_kp_s_Block_methodAction_desc_s_method; static PyObject *__pyx_kp_s_Block_methodAction_desc_s_target; static PyObject *__pyx_kp_s_Block_s_s; static PyObject *__pyx_kp_s_Block_scriptAction_desc_s_target; static PyObject *__pyx_kp_s_Block_uniaction_called_desc_s_ar; +static PyObject *__pyx_kp_s_Block_urlwidgetAction_called_des; static PyObject *__pyx_kp_s_Block_urlwidgetAction_desc_s_wid; static PyObject *__pyx_kp_s_Block_w_build_desc_invalid; static PyObject *__pyx_n_s_Blocks; @@ -2105,6 +2110,7 @@ static PyObject *__pyx_n_s_InputBox; static PyObject *__pyx_n_s_Layout; static PyObject *__pyx_n_s_Logger; static PyObject *__pyx_kp_s_Method_s_not_found_in_class_s; +static PyObject *__pyx_n_s_ModalView; static PyObject *__pyx_n_s_NotExistsObject; static PyObject *__pyx_n_s_NotExistsObject___expr; static PyObject *__pyx_n_s_NotExistsObject___init; @@ -2266,7 +2272,6 @@ static PyObject *__pyx_n_s_json; static PyObject *__pyx_n_s_k; static PyObject *__pyx_n_s_keyMapping; static PyObject *__pyx_n_s_keymapping; -static PyObject *__pyx_n_s_kivy; static PyObject *__pyx_n_s_kivy_app; static PyObject *__pyx_n_s_kivy_config; static PyObject *__pyx_n_s_kivy_core_window; @@ -2274,6 +2279,7 @@ static PyObject *__pyx_n_s_kivy_factory; static PyObject *__pyx_n_s_kivy_logger; static PyObject *__pyx_n_s_kivy_metrics; static PyObject *__pyx_n_s_kivy_properties; +static PyObject *__pyx_n_s_kivy_uix_modalview; static PyObject *__pyx_n_s_kivy_uix_video; static PyObject *__pyx_n_s_kivy_uix_widget; static PyObject *__pyx_n_s_kivyblocks_blocks; @@ -5133,7 +5139,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_6buildAction(CYTHON_UNUSE * func =partial(blocks.conform_action,widget, desc) * return func # <<<<<<<<<<<<<< * - * + * def eval(self, s:str, l:dict): */ __Pyx_XDECREF(__pyx_r); __Pyx_INCREF(__pyx_v_func); @@ -5166,8 +5172,8 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_6buildAction(CYTHON_UNUSE return __pyx_r; } -/* "kivyblocks/blocks.pyx":132 - * +/* "kivyblocks/blocks.pyx":131 + * return func * * def eval(self, s:str, l:dict): # <<<<<<<<<<<<<< * g = {} @@ -5212,17 +5218,17 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_9eval(PyObject *__pyx_sel case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_s)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("eval", 1, 3, 3, 1); __PYX_ERR(0, 132, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("eval", 1, 3, 3, 1); __PYX_ERR(0, 131, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: if (likely((values[2] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_l)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("eval", 1, 3, 3, 2); __PYX_ERR(0, 132, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("eval", 1, 3, 3, 2); __PYX_ERR(0, 131, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "eval") < 0)) __PYX_ERR(0, 132, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "eval") < 0)) __PYX_ERR(0, 131, __pyx_L3_error) } } else if (PyTuple_GET_SIZE(__pyx_args) != 3) { goto __pyx_L5_argtuple_error; @@ -5237,14 +5243,14 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_9eval(PyObject *__pyx_sel } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("eval", 1, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 132, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("eval", 1, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 131, __pyx_L3_error) __pyx_L3_error:; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.eval", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); return NULL; __pyx_L4_argument_unpacking_done:; - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_s), (&PyString_Type), 1, "s", 1))) __PYX_ERR(0, 132, __pyx_L1_error) - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_l), (&PyDict_Type), 1, "l", 1))) __PYX_ERR(0, 132, __pyx_L1_error) + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_s), (&PyString_Type), 1, "s", 1))) __PYX_ERR(0, 131, __pyx_L1_error) + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_l), (&PyDict_Type), 1, "l", 1))) __PYX_ERR(0, 131, __pyx_L1_error) __pyx_r = __pyx_pf_10kivyblocks_6blocks_6Blocks_8eval(__pyx_self, __pyx_v_self, __pyx_v_s, __pyx_v_l); /* function exit code */ @@ -5278,26 +5284,26 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_8eval(CYTHON_UNUSED PyObj int __pyx_clineno = 0; __Pyx_RefNannySetupContext("eval", 0); - /* "kivyblocks/blocks.pyx":133 + /* "kivyblocks/blocks.pyx":132 * * def eval(self, s:str, l:dict): * g = {} # <<<<<<<<<<<<<< * forbidens = [ * "os", */ - __pyx_t_1 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 133, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 132, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_v_g = ((PyObject*)__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":134 + /* "kivyblocks/blocks.pyx":133 * def eval(self, s:str, l:dict): * g = {} * forbidens = [ # <<<<<<<<<<<<<< * "os", * "sys", */ - __pyx_t_1 = PyList_New(4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 134, __pyx_L1_error) + __pyx_t_1 = PyList_New(4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 133, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_n_s_os); __Pyx_GIVEREF(__pyx_n_s_os); @@ -5314,16 +5320,16 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_8eval(CYTHON_UNUSED PyObj __pyx_v_forbidens = ((PyObject*)__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":141 + /* "kivyblocks/blocks.pyx":140 * ] * * for k,v in globals().copy().items(): # <<<<<<<<<<<<<< * if k not in forbidens: * g[k] = v */ - __pyx_t_3 = __Pyx_Globals(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 141, __pyx_L1_error) + __pyx_t_3 = __Pyx_Globals(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 140, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_copy); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 141, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_copy); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 140, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_t_3 = NULL; @@ -5338,10 +5344,10 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_8eval(CYTHON_UNUSED PyObj } __pyx_t_2 = (__pyx_t_3) ? __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_3) : __Pyx_PyObject_CallNoArg(__pyx_t_4); __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 141, __pyx_L1_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 140, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_items); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 141, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_items); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 140, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_t_2 = NULL; @@ -5356,16 +5362,16 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_8eval(CYTHON_UNUSED PyObj } __pyx_t_1 = (__pyx_t_2) ? __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_2) : __Pyx_PyObject_CallNoArg(__pyx_t_4); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 141, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 140, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; if (likely(PyList_CheckExact(__pyx_t_1)) || PyTuple_CheckExact(__pyx_t_1)) { __pyx_t_4 = __pyx_t_1; __Pyx_INCREF(__pyx_t_4); __pyx_t_5 = 0; __pyx_t_6 = NULL; } else { - __pyx_t_5 = -1; __pyx_t_4 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 141, __pyx_L1_error) + __pyx_t_5 = -1; __pyx_t_4 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 140, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_6 = Py_TYPE(__pyx_t_4)->tp_iternext; if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 141, __pyx_L1_error) + __pyx_t_6 = Py_TYPE(__pyx_t_4)->tp_iternext; if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 140, __pyx_L1_error) } __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; for (;;) { @@ -5373,17 +5379,17 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_8eval(CYTHON_UNUSED PyObj if (likely(PyList_CheckExact(__pyx_t_4))) { if (__pyx_t_5 >= PyList_GET_SIZE(__pyx_t_4)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_1 = PyList_GET_ITEM(__pyx_t_4, __pyx_t_5); __Pyx_INCREF(__pyx_t_1); __pyx_t_5++; if (unlikely(0 < 0)) __PYX_ERR(0, 141, __pyx_L1_error) + __pyx_t_1 = PyList_GET_ITEM(__pyx_t_4, __pyx_t_5); __Pyx_INCREF(__pyx_t_1); __pyx_t_5++; if (unlikely(0 < 0)) __PYX_ERR(0, 140, __pyx_L1_error) #else - __pyx_t_1 = PySequence_ITEM(__pyx_t_4, __pyx_t_5); __pyx_t_5++; if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 141, __pyx_L1_error) + __pyx_t_1 = PySequence_ITEM(__pyx_t_4, __pyx_t_5); __pyx_t_5++; if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 140, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); #endif } else { if (__pyx_t_5 >= PyTuple_GET_SIZE(__pyx_t_4)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_1 = PyTuple_GET_ITEM(__pyx_t_4, __pyx_t_5); __Pyx_INCREF(__pyx_t_1); __pyx_t_5++; if (unlikely(0 < 0)) __PYX_ERR(0, 141, __pyx_L1_error) + __pyx_t_1 = PyTuple_GET_ITEM(__pyx_t_4, __pyx_t_5); __Pyx_INCREF(__pyx_t_1); __pyx_t_5++; if (unlikely(0 < 0)) __PYX_ERR(0, 140, __pyx_L1_error) #else - __pyx_t_1 = PySequence_ITEM(__pyx_t_4, __pyx_t_5); __pyx_t_5++; if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 141, __pyx_L1_error) + __pyx_t_1 = PySequence_ITEM(__pyx_t_4, __pyx_t_5); __pyx_t_5++; if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 140, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); #endif } @@ -5393,7 +5399,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_8eval(CYTHON_UNUSED PyObj PyObject* exc_type = PyErr_Occurred(); if (exc_type) { if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); - else __PYX_ERR(0, 141, __pyx_L1_error) + else __PYX_ERR(0, 140, __pyx_L1_error) } break; } @@ -5405,7 +5411,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_8eval(CYTHON_UNUSED PyObj if (unlikely(size != 2)) { if (size > 2) __Pyx_RaiseTooManyValuesError(2); else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size); - __PYX_ERR(0, 141, __pyx_L1_error) + __PYX_ERR(0, 140, __pyx_L1_error) } #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS if (likely(PyTuple_CheckExact(sequence))) { @@ -5418,15 +5424,15 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_8eval(CYTHON_UNUSED PyObj __Pyx_INCREF(__pyx_t_2); __Pyx_INCREF(__pyx_t_3); #else - __pyx_t_2 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 141, __pyx_L1_error) + __pyx_t_2 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 140, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 141, __pyx_L1_error) + __pyx_t_3 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 140, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); #endif __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; } else { Py_ssize_t index = -1; - __pyx_t_7 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 141, __pyx_L1_error) + __pyx_t_7 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 140, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_t_8 = Py_TYPE(__pyx_t_7)->tp_iternext; @@ -5434,7 +5440,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_8eval(CYTHON_UNUSED PyObj __Pyx_GOTREF(__pyx_t_2); index = 1; __pyx_t_3 = __pyx_t_8(__pyx_t_7); if (unlikely(!__pyx_t_3)) goto __pyx_L5_unpacking_failed; __Pyx_GOTREF(__pyx_t_3); - if (__Pyx_IternextUnpackEndCheck(__pyx_t_8(__pyx_t_7), 2) < 0) __PYX_ERR(0, 141, __pyx_L1_error) + if (__Pyx_IternextUnpackEndCheck(__pyx_t_8(__pyx_t_7), 2) < 0) __PYX_ERR(0, 140, __pyx_L1_error) __pyx_t_8 = NULL; __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; goto __pyx_L6_unpacking_done; @@ -5442,7 +5448,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_8eval(CYTHON_UNUSED PyObj __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; __pyx_t_8 = NULL; if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index); - __PYX_ERR(0, 141, __pyx_L1_error) + __PYX_ERR(0, 140, __pyx_L1_error) __pyx_L6_unpacking_done:; } __Pyx_XDECREF_SET(__pyx_v_k, __pyx_t_2); @@ -5450,27 +5456,27 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_8eval(CYTHON_UNUSED PyObj __Pyx_XDECREF_SET(__pyx_v_v, __pyx_t_3); __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":142 + /* "kivyblocks/blocks.pyx":141 * * for k,v in globals().copy().items(): * if k not in forbidens: # <<<<<<<<<<<<<< * g[k] = v * */ - __pyx_t_9 = (__Pyx_PySequence_ContainsTF(__pyx_v_k, __pyx_v_forbidens, Py_NE)); if (unlikely(__pyx_t_9 < 0)) __PYX_ERR(0, 142, __pyx_L1_error) + __pyx_t_9 = (__Pyx_PySequence_ContainsTF(__pyx_v_k, __pyx_v_forbidens, Py_NE)); if (unlikely(__pyx_t_9 < 0)) __PYX_ERR(0, 141, __pyx_L1_error) __pyx_t_10 = (__pyx_t_9 != 0); if (__pyx_t_10) { - /* "kivyblocks/blocks.pyx":143 + /* "kivyblocks/blocks.pyx":142 * for k,v in globals().copy().items(): * if k not in forbidens: * g[k] = v # <<<<<<<<<<<<<< * * """ */ - if (unlikely(PyDict_SetItem(__pyx_v_g, __pyx_v_k, __pyx_v_v) < 0)) __PYX_ERR(0, 143, __pyx_L1_error) + if (unlikely(PyDict_SetItem(__pyx_v_g, __pyx_v_k, __pyx_v_v) < 0)) __PYX_ERR(0, 142, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":142 + /* "kivyblocks/blocks.pyx":141 * * for k,v in globals().copy().items(): * if k not in forbidens: # <<<<<<<<<<<<<< @@ -5479,7 +5485,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_8eval(CYTHON_UNUSED PyObj */ } - /* "kivyblocks/blocks.pyx":141 + /* "kivyblocks/blocks.pyx":140 * ] * * for k,v in globals().copy().items(): # <<<<<<<<<<<<<< @@ -5489,21 +5495,21 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_8eval(CYTHON_UNUSED PyObj } __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":151 + /* "kivyblocks/blocks.pyx":150 * g['__builtins__']['open'] = None * """ * g.update(self.env) # <<<<<<<<<<<<<< * return eval(s,g,l) * */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_env); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 151, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_env); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 150, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_1 = __Pyx_CallUnboundCMethod1(&__pyx_umethod_PyDict_Type_update, __pyx_v_g, __pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 151, __pyx_L1_error) + __pyx_t_1 = __Pyx_CallUnboundCMethod1(&__pyx_umethod_PyDict_Type_update, __pyx_v_g, __pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 150, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":152 + /* "kivyblocks/blocks.pyx":151 * """ * g.update(self.env) * return eval(s,g,l) # <<<<<<<<<<<<<< @@ -5511,7 +5517,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_8eval(CYTHON_UNUSED PyObj * def getUrlData(self, url:str, method:str='GET', */ __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = PyTuple_New(3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 152, __pyx_L1_error) + __pyx_t_1 = PyTuple_New(3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 151, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_v_s); __Pyx_GIVEREF(__pyx_v_s); @@ -5522,15 +5528,15 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_8eval(CYTHON_UNUSED PyObj __Pyx_INCREF(__pyx_v_l); __Pyx_GIVEREF(__pyx_v_l); PyTuple_SET_ITEM(__pyx_t_1, 2, __pyx_v_l); - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_eval, __pyx_t_1, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 152, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_eval, __pyx_t_1, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 151, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_r = __pyx_t_4; __pyx_t_4 = 0; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":132 - * + /* "kivyblocks/blocks.pyx":131 + * return func * * def eval(self, s:str, l:dict): # <<<<<<<<<<<<<< * g = {} @@ -5556,7 +5562,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_8eval(CYTHON_UNUSED PyObj return __pyx_r; } -/* "kivyblocks/blocks.pyx":154 +/* "kivyblocks/blocks.pyx":153 * return eval(s,g,l) * * def getUrlData(self, url:str, method:str='GET', # <<<<<<<<<<<<<< @@ -5575,14 +5581,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_2__defaults__(CYTHON_UNUSED PyObj __Pyx_RefNannySetupContext("__defaults__", 0); __Pyx_XDECREF(__pyx_r); - /* "kivyblocks/blocks.pyx":157 + /* "kivyblocks/blocks.pyx":156 * params:dict={}, files:dict={}, * callback=None, * errback=None,**kw): # <<<<<<<<<<<<<< * * if url is None: */ - __pyx_t_1 = PyTuple_New(5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 154, __pyx_L1_error) + __pyx_t_1 = PyTuple_New(5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 153, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(((PyObject*)__pyx_n_s_GET)); __Pyx_GIVEREF(((PyObject*)__pyx_n_s_GET)); @@ -5600,14 +5606,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_2__defaults__(CYTHON_UNUSED PyObj __Pyx_GIVEREF(((PyObject *)Py_None)); PyTuple_SET_ITEM(__pyx_t_1, 4, ((PyObject *)Py_None)); - /* "kivyblocks/blocks.pyx":154 + /* "kivyblocks/blocks.pyx":153 * return eval(s,g,l) * * def getUrlData(self, url:str, method:str='GET', # <<<<<<<<<<<<<< * params:dict={}, files:dict={}, * callback=None, */ - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 154, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 153, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_GIVEREF(__pyx_t_1); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1); @@ -5690,7 +5696,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_11getUrlData(PyObject *__ case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_url)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("getUrlData", 0, 2, 7, 1); __PYX_ERR(0, 154, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("getUrlData", 0, 2, 7, 1); __PYX_ERR(0, 153, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: @@ -5724,7 +5730,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_11getUrlData(PyObject *__ } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, __pyx_v_kw, values, pos_args, "getUrlData") < 0)) __PYX_ERR(0, 154, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, __pyx_v_kw, values, pos_args, "getUrlData") < 0)) __PYX_ERR(0, 153, __pyx_L3_error) } } else { switch (PyTuple_GET_SIZE(__pyx_args)) { @@ -5754,17 +5760,17 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_11getUrlData(PyObject *__ } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("getUrlData", 0, 2, 7, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 154, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("getUrlData", 0, 2, 7, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 153, __pyx_L3_error) __pyx_L3_error:; __Pyx_DECREF(__pyx_v_kw); __pyx_v_kw = 0; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.getUrlData", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); return NULL; __pyx_L4_argument_unpacking_done:; - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_url), (&PyString_Type), 1, "url", 1))) __PYX_ERR(0, 154, __pyx_L1_error) - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_method), (&PyString_Type), 1, "method", 1))) __PYX_ERR(0, 154, __pyx_L1_error) - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_params), (&PyDict_Type), 1, "params", 1))) __PYX_ERR(0, 155, __pyx_L1_error) - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_files), (&PyDict_Type), 1, "files", 1))) __PYX_ERR(0, 155, __pyx_L1_error) + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_url), (&PyString_Type), 1, "url", 1))) __PYX_ERR(0, 153, __pyx_L1_error) + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_method), (&PyString_Type), 1, "method", 1))) __PYX_ERR(0, 153, __pyx_L1_error) + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_params), (&PyDict_Type), 1, "params", 1))) __PYX_ERR(0, 154, __pyx_L1_error) + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_files), (&PyDict_Type), 1, "files", 1))) __PYX_ERR(0, 154, __pyx_L1_error) __pyx_r = __pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(__pyx_self, __pyx_v_self, __pyx_v_url, __pyx_v_method, __pyx_v_params, __pyx_v_files, __pyx_v_callback, __pyx_v_errback, __pyx_v_kw); /* function exit code */ @@ -5809,7 +5815,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE __Pyx_RefNannySetupContext("getUrlData", 0); __Pyx_INCREF(__pyx_v_url); - /* "kivyblocks/blocks.pyx":159 + /* "kivyblocks/blocks.pyx":158 * errback=None,**kw): * * if url is None: # <<<<<<<<<<<<<< @@ -5820,24 +5826,24 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE __pyx_t_2 = (__pyx_t_1 != 0); if (__pyx_t_2) { - /* "kivyblocks/blocks.pyx":160 + /* "kivyblocks/blocks.pyx":159 * * if url is None: * if errback: # <<<<<<<<<<<<<< * errback(None,Exception('url is None')) * else: */ - __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_errback); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 160, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_errback); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 159, __pyx_L1_error) if (__pyx_t_2) { - /* "kivyblocks/blocks.pyx":161 + /* "kivyblocks/blocks.pyx":160 * if url is None: * if errback: * errback(None,Exception('url is None')) # <<<<<<<<<<<<<< * else: * return None */ - __pyx_t_4 = __Pyx_PyObject_Call(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])), __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 161, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_Call(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])), __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 160, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_INCREF(__pyx_v_errback); __pyx_t_5 = __pyx_v_errback; __pyx_t_6 = NULL; @@ -5855,7 +5861,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_5)) { PyObject *__pyx_temp[3] = {__pyx_t_6, Py_None, __pyx_t_4}; - __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 161, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 160, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; @@ -5864,14 +5870,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) { PyObject *__pyx_temp[3] = {__pyx_t_6, Py_None, __pyx_t_4}; - __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 161, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 160, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; } else #endif { - __pyx_t_8 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 161, __pyx_L1_error) + __pyx_t_8 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 160, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); if (__pyx_t_6) { __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_6); __pyx_t_6 = NULL; @@ -5882,14 +5888,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_8, 1+__pyx_t_7, __pyx_t_4); __pyx_t_4 = 0; - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_8, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 161, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_8, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 160, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; } __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":160 + /* "kivyblocks/blocks.pyx":159 * * if url is None: * if errback: # <<<<<<<<<<<<<< @@ -5899,7 +5905,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE goto __pyx_L4; } - /* "kivyblocks/blocks.pyx":163 + /* "kivyblocks/blocks.pyx":162 * errback(None,Exception('url is None')) * else: * return None # <<<<<<<<<<<<<< @@ -5913,7 +5919,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE } __pyx_L4:; - /* "kivyblocks/blocks.pyx":159 + /* "kivyblocks/blocks.pyx":158 * errback=None,**kw): * * if url is None: # <<<<<<<<<<<<<< @@ -5922,7 +5928,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE */ } - /* "kivyblocks/blocks.pyx":165 + /* "kivyblocks/blocks.pyx":164 * return None * * if url.startswith('file://'): # <<<<<<<<<<<<<< @@ -5931,12 +5937,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE */ if (unlikely(__pyx_v_url == Py_None)) { PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%.30s'", "startswith"); - __PYX_ERR(0, 165, __pyx_L1_error) + __PYX_ERR(0, 164, __pyx_L1_error) } - __pyx_t_2 = __Pyx_PyStr_Tailmatch(__pyx_v_url, __pyx_kp_s_file, 0, PY_SSIZE_T_MAX, -1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 165, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyStr_Tailmatch(__pyx_v_url, __pyx_kp_s_file, 0, PY_SSIZE_T_MAX, -1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 164, __pyx_L1_error) if ((__pyx_t_2 != 0)) { - /* "kivyblocks/blocks.pyx":166 + /* "kivyblocks/blocks.pyx":165 * * if url.startswith('file://'): * filename = url[7:] # <<<<<<<<<<<<<< @@ -5945,14 +5951,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE */ if (unlikely(__pyx_v_url == Py_None)) { PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable"); - __PYX_ERR(0, 166, __pyx_L1_error) + __PYX_ERR(0, 165, __pyx_L1_error) } - __pyx_t_3 = PySequence_GetSlice(__pyx_v_url, 7, PY_SSIZE_T_MAX); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 166, __pyx_L1_error) + __pyx_t_3 = PySequence_GetSlice(__pyx_v_url, 7, PY_SSIZE_T_MAX); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 165, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_v_filename = __pyx_t_3; __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":167 + /* "kivyblocks/blocks.pyx":166 * if url.startswith('file://'): * filename = url[7:] * with codecs.open(filename,'r','utf-8') as f: # <<<<<<<<<<<<<< @@ -5960,9 +5966,9 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE * dic = json.loads(b) */ /*with:*/ { - __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_codecs); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 167, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_codecs); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 166, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_open); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 167, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_open); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 166, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_t_5 = NULL; @@ -5980,7 +5986,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_8)) { PyObject *__pyx_temp[4] = {__pyx_t_5, __pyx_v_filename, __pyx_n_s_r, __pyx_kp_s_utf_8}; - __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_7, 3+__pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 167, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_7, 3+__pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 166, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_GOTREF(__pyx_t_3); } else @@ -5988,13 +5994,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_8)) { PyObject *__pyx_temp[4] = {__pyx_t_5, __pyx_v_filename, __pyx_n_s_r, __pyx_kp_s_utf_8}; - __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_7, 3+__pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 167, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_7, 3+__pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 166, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_GOTREF(__pyx_t_3); } else #endif { - __pyx_t_4 = PyTuple_New(3+__pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 167, __pyx_L1_error) + __pyx_t_4 = PyTuple_New(3+__pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 166, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); if (__pyx_t_5) { __Pyx_GIVEREF(__pyx_t_5); PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_5); __pyx_t_5 = NULL; @@ -6008,14 +6014,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE __Pyx_INCREF(__pyx_kp_s_utf_8); __Pyx_GIVEREF(__pyx_kp_s_utf_8); PyTuple_SET_ITEM(__pyx_t_4, 2+__pyx_t_7, __pyx_kp_s_utf_8); - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 167, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 166, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; } __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - __pyx_t_9 = __Pyx_PyObject_LookupSpecial(__pyx_t_3, __pyx_n_s_exit); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 167, __pyx_L1_error) + __pyx_t_9 = __Pyx_PyObject_LookupSpecial(__pyx_t_3, __pyx_n_s_exit); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 166, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_9); - __pyx_t_4 = __Pyx_PyObject_LookupSpecial(__pyx_t_3, __pyx_n_s_enter); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 167, __pyx_L6_error) + __pyx_t_4 = __Pyx_PyObject_LookupSpecial(__pyx_t_3, __pyx_n_s_enter); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 166, __pyx_L6_error) __Pyx_GOTREF(__pyx_t_4); __pyx_t_5 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_4))) { @@ -6029,7 +6035,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE } __pyx_t_8 = (__pyx_t_5) ? __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_5) : __Pyx_PyObject_CallNoArg(__pyx_t_4); __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 167, __pyx_L6_error) + if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 166, __pyx_L6_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __pyx_t_4 = __pyx_t_8; @@ -6047,14 +6053,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE __pyx_v_f = __pyx_t_4; __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":168 + /* "kivyblocks/blocks.pyx":167 * filename = url[7:] * with codecs.open(filename,'r','utf-8') as f: * b = f.read() # <<<<<<<<<<<<<< * dic = json.loads(b) * return dic */ - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_read); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 168, __pyx_L10_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_read); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 167, __pyx_L10_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_8 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_3))) { @@ -6068,22 +6074,22 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE } __pyx_t_4 = (__pyx_t_8) ? __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_8) : __Pyx_PyObject_CallNoArg(__pyx_t_3); __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; - if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 168, __pyx_L10_error) + if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 167, __pyx_L10_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_v_b = __pyx_t_4; __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":169 + /* "kivyblocks/blocks.pyx":168 * with codecs.open(filename,'r','utf-8') as f: * b = f.read() * dic = json.loads(b) # <<<<<<<<<<<<<< * return dic * elif url.startswith('http://') or url.startswith('https://'): */ - __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_json); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 169, __pyx_L10_error) + __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_json); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 168, __pyx_L10_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_loads); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 169, __pyx_L10_error) + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_loads); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 168, __pyx_L10_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_t_3 = NULL; @@ -6098,13 +6104,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE } __pyx_t_4 = (__pyx_t_3) ? __Pyx_PyObject_Call2Args(__pyx_t_8, __pyx_t_3, __pyx_v_b) : __Pyx_PyObject_CallOneArg(__pyx_t_8, __pyx_v_b); __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 169, __pyx_L10_error) + if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 168, __pyx_L10_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __pyx_v_dic = __pyx_t_4; __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":170 + /* "kivyblocks/blocks.pyx":169 * b = f.read() * dic = json.loads(b) * return dic # <<<<<<<<<<<<<< @@ -6116,7 +6122,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE __pyx_r = __pyx_v_dic; goto __pyx_L14_try_return; - /* "kivyblocks/blocks.pyx":167 + /* "kivyblocks/blocks.pyx":166 * if url.startswith('file://'): * filename = url[7:] * with codecs.open(filename,'r','utf-8') as f: # <<<<<<<<<<<<<< @@ -6132,20 +6138,20 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; /*except:*/ { __Pyx_AddTraceback("kivyblocks.blocks.Blocks.getUrlData", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_4, &__pyx_t_8, &__pyx_t_3) < 0) __PYX_ERR(0, 167, __pyx_L12_except_error) + if (__Pyx_GetException(&__pyx_t_4, &__pyx_t_8, &__pyx_t_3) < 0) __PYX_ERR(0, 166, __pyx_L12_except_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_GOTREF(__pyx_t_8); __Pyx_GOTREF(__pyx_t_3); - __pyx_t_5 = PyTuple_Pack(3, __pyx_t_4, __pyx_t_8, __pyx_t_3); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 167, __pyx_L12_except_error) + __pyx_t_5 = PyTuple_Pack(3, __pyx_t_4, __pyx_t_8, __pyx_t_3); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 166, __pyx_L12_except_error) __Pyx_GOTREF(__pyx_t_5); __pyx_t_13 = __Pyx_PyObject_Call(__pyx_t_9, __pyx_t_5, NULL); __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_13)) __PYX_ERR(0, 167, __pyx_L12_except_error) + if (unlikely(!__pyx_t_13)) __PYX_ERR(0, 166, __pyx_L12_except_error) __Pyx_GOTREF(__pyx_t_13); __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_13); __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; - if (__pyx_t_2 < 0) __PYX_ERR(0, 167, __pyx_L12_except_error) + if (__pyx_t_2 < 0) __PYX_ERR(0, 166, __pyx_L12_except_error) __pyx_t_1 = ((!(__pyx_t_2 != 0)) != 0); if (__pyx_t_1) { __Pyx_GIVEREF(__pyx_t_4); @@ -6153,7 +6159,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE __Pyx_XGIVEREF(__pyx_t_3); __Pyx_ErrRestoreWithState(__pyx_t_4, __pyx_t_8, __pyx_t_3); __pyx_t_4 = 0; __pyx_t_8 = 0; __pyx_t_3 = 0; - __PYX_ERR(0, 167, __pyx_L12_except_error) + __PYX_ERR(0, 166, __pyx_L12_except_error) } __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; @@ -6184,7 +6190,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE if (__pyx_t_9) { __pyx_t_12 = __Pyx_PyObject_Call(__pyx_t_9, __pyx_tuple__3, NULL); __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; - if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 167, __pyx_L1_error) + if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 166, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; } @@ -6196,7 +6202,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE if (__pyx_t_9) { __pyx_t_11 = __Pyx_PyObject_Call(__pyx_t_9, __pyx_tuple__3, NULL); __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; - if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 167, __pyx_L1_error) + if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 166, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_11); __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; } @@ -6213,7 +6219,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE __pyx_L19:; } - /* "kivyblocks/blocks.pyx":165 + /* "kivyblocks/blocks.pyx":164 * return None * * if url.startswith('file://'): # <<<<<<<<<<<<<< @@ -6223,7 +6229,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE goto __pyx_L5; } - /* "kivyblocks/blocks.pyx":171 + /* "kivyblocks/blocks.pyx":170 * dic = json.loads(b) * return dic * elif url.startswith('http://') or url.startswith('https://'): # <<<<<<<<<<<<<< @@ -6232,9 +6238,9 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE */ if (unlikely(__pyx_v_url == Py_None)) { PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%.30s'", "startswith"); - __PYX_ERR(0, 171, __pyx_L1_error) + __PYX_ERR(0, 170, __pyx_L1_error) } - __pyx_t_2 = __Pyx_PyStr_Tailmatch(__pyx_v_url, __pyx_kp_s_http, 0, PY_SSIZE_T_MAX, -1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 171, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyStr_Tailmatch(__pyx_v_url, __pyx_kp_s_http, 0, PY_SSIZE_T_MAX, -1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 170, __pyx_L1_error) if (!(__pyx_t_2 != 0)) { } else { __pyx_t_1 = (__pyx_t_2 != 0); @@ -6242,14 +6248,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE } if (unlikely(__pyx_v_url == Py_None)) { PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%.30s'", "startswith"); - __PYX_ERR(0, 171, __pyx_L1_error) + __PYX_ERR(0, 170, __pyx_L1_error) } - __pyx_t_2 = __Pyx_PyStr_Tailmatch(__pyx_v_url, __pyx_kp_s_https, 0, PY_SSIZE_T_MAX, -1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 171, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyStr_Tailmatch(__pyx_v_url, __pyx_kp_s_https, 0, PY_SSIZE_T_MAX, -1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 170, __pyx_L1_error) __pyx_t_1 = (__pyx_t_2 != 0); __pyx_L20_bool_binop_done:; if (__pyx_t_1) { - /* "kivyblocks/blocks.pyx":172 + /* "kivyblocks/blocks.pyx":171 * return dic * elif url.startswith('http://') or url.startswith('https://'): * try: # <<<<<<<<<<<<<< @@ -6265,14 +6271,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE __Pyx_XGOTREF(__pyx_t_11); /*try:*/ { - /* "kivyblocks/blocks.pyx":173 + /* "kivyblocks/blocks.pyx":172 * elif url.startswith('http://') or url.startswith('https://'): * try: * hc = HttpClient() # <<<<<<<<<<<<<< * resp=hc(url,method=method,params=params,files=files) * # print('Blocks.py :resp=',resp) */ - __Pyx_GetModuleGlobalName(__pyx_t_8, __pyx_n_s_HttpClient); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 173, __pyx_L22_error) + __Pyx_GetModuleGlobalName(__pyx_t_8, __pyx_n_s_HttpClient); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 172, __pyx_L22_error) __Pyx_GOTREF(__pyx_t_8); __pyx_t_4 = NULL; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_8))) { @@ -6286,37 +6292,37 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE } __pyx_t_3 = (__pyx_t_4) ? __Pyx_PyObject_CallOneArg(__pyx_t_8, __pyx_t_4) : __Pyx_PyObject_CallNoArg(__pyx_t_8); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 173, __pyx_L22_error) + if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 172, __pyx_L22_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __pyx_v_hc = __pyx_t_3; __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":174 + /* "kivyblocks/blocks.pyx":173 * try: * hc = HttpClient() * resp=hc(url,method=method,params=params,files=files) # <<<<<<<<<<<<<< * # print('Blocks.py :resp=',resp) * return resp */ - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 174, __pyx_L22_error) + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 173, __pyx_L22_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_INCREF(__pyx_v_url); __Pyx_GIVEREF(__pyx_v_url); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_url); - __pyx_t_8 = __Pyx_PyDict_NewPresized(3); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 174, __pyx_L22_error) + __pyx_t_8 = __Pyx_PyDict_NewPresized(3); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 173, __pyx_L22_error) __Pyx_GOTREF(__pyx_t_8); - if (PyDict_SetItem(__pyx_t_8, __pyx_n_s_method, __pyx_v_method) < 0) __PYX_ERR(0, 174, __pyx_L22_error) - if (PyDict_SetItem(__pyx_t_8, __pyx_n_s_params, __pyx_v_params) < 0) __PYX_ERR(0, 174, __pyx_L22_error) - if (PyDict_SetItem(__pyx_t_8, __pyx_n_s_files, __pyx_v_files) < 0) __PYX_ERR(0, 174, __pyx_L22_error) - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_v_hc, __pyx_t_3, __pyx_t_8); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 174, __pyx_L22_error) + if (PyDict_SetItem(__pyx_t_8, __pyx_n_s_method, __pyx_v_method) < 0) __PYX_ERR(0, 173, __pyx_L22_error) + if (PyDict_SetItem(__pyx_t_8, __pyx_n_s_params, __pyx_v_params) < 0) __PYX_ERR(0, 173, __pyx_L22_error) + if (PyDict_SetItem(__pyx_t_8, __pyx_n_s_files, __pyx_v_files) < 0) __PYX_ERR(0, 173, __pyx_L22_error) + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_v_hc, __pyx_t_3, __pyx_t_8); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 173, __pyx_L22_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __pyx_v_resp = __pyx_t_4; __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":176 + /* "kivyblocks/blocks.pyx":175 * resp=hc(url,method=method,params=params,files=files) * # print('Blocks.py :resp=',resp) * return resp # <<<<<<<<<<<<<< @@ -6328,7 +6334,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE __pyx_r = __pyx_v_resp; goto __pyx_L26_try_return; - /* "kivyblocks/blocks.pyx":172 + /* "kivyblocks/blocks.pyx":171 * return dic * elif url.startswith('http://') or url.startswith('https://'): * try: # <<<<<<<<<<<<<< @@ -6343,7 +6349,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "kivyblocks/blocks.pyx":177 + /* "kivyblocks/blocks.pyx":176 * # print('Blocks.py :resp=',resp) * return resp * except Exception as e: # <<<<<<<<<<<<<< @@ -6353,21 +6359,21 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE __pyx_t_7 = __Pyx_PyErr_ExceptionMatches(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); if (__pyx_t_7) { __Pyx_AddTraceback("kivyblocks.blocks.Blocks.getUrlData", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_4, &__pyx_t_8, &__pyx_t_3) < 0) __PYX_ERR(0, 177, __pyx_L24_except_error) + if (__Pyx_GetException(&__pyx_t_4, &__pyx_t_8, &__pyx_t_3) < 0) __PYX_ERR(0, 176, __pyx_L24_except_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_GOTREF(__pyx_t_8); __Pyx_GOTREF(__pyx_t_3); __Pyx_INCREF(__pyx_t_8); __pyx_v_e = __pyx_t_8; - /* "kivyblocks/blocks.pyx":178 + /* "kivyblocks/blocks.pyx":177 * return resp * except Exception as e: * print_exc() # <<<<<<<<<<<<<< * if errback: * return errback(None,e) */ - __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_print_exc); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 178, __pyx_L24_except_error) + __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_print_exc); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 177, __pyx_L24_except_error) __Pyx_GOTREF(__pyx_t_6); __pyx_t_14 = NULL; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_6))) { @@ -6381,22 +6387,22 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE } __pyx_t_5 = (__pyx_t_14) ? __Pyx_PyObject_CallOneArg(__pyx_t_6, __pyx_t_14) : __Pyx_PyObject_CallNoArg(__pyx_t_6); __Pyx_XDECREF(__pyx_t_14); __pyx_t_14 = 0; - if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 178, __pyx_L24_except_error) + if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 177, __pyx_L24_except_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":179 + /* "kivyblocks/blocks.pyx":178 * except Exception as e: * print_exc() * if errback: # <<<<<<<<<<<<<< * return errback(None,e) * return None */ - __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_v_errback); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 179, __pyx_L24_except_error) + __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_v_errback); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 178, __pyx_L24_except_error) if (__pyx_t_1) { - /* "kivyblocks/blocks.pyx":180 + /* "kivyblocks/blocks.pyx":179 * print_exc() * if errback: * return errback(None,e) # <<<<<<<<<<<<<< @@ -6420,7 +6426,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_6)) { PyObject *__pyx_temp[3] = {__pyx_t_14, Py_None, __pyx_v_e}; - __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_6, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 180, __pyx_L24_except_error) + __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_6, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 179, __pyx_L24_except_error) __Pyx_XDECREF(__pyx_t_14); __pyx_t_14 = 0; __Pyx_GOTREF(__pyx_t_5); } else @@ -6428,13 +6434,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_6)) { PyObject *__pyx_temp[3] = {__pyx_t_14, Py_None, __pyx_v_e}; - __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_6, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 180, __pyx_L24_except_error) + __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_6, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 179, __pyx_L24_except_error) __Pyx_XDECREF(__pyx_t_14); __pyx_t_14 = 0; __Pyx_GOTREF(__pyx_t_5); } else #endif { - __pyx_t_15 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_15)) __PYX_ERR(0, 180, __pyx_L24_except_error) + __pyx_t_15 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_15)) __PYX_ERR(0, 179, __pyx_L24_except_error) __Pyx_GOTREF(__pyx_t_15); if (__pyx_t_14) { __Pyx_GIVEREF(__pyx_t_14); PyTuple_SET_ITEM(__pyx_t_15, 0, __pyx_t_14); __pyx_t_14 = NULL; @@ -6445,7 +6451,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE __Pyx_INCREF(__pyx_v_e); __Pyx_GIVEREF(__pyx_v_e); PyTuple_SET_ITEM(__pyx_t_15, 1+__pyx_t_7, __pyx_v_e); - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_15, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 180, __pyx_L24_except_error) + __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_15, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 179, __pyx_L24_except_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0; } @@ -6457,7 +6463,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; goto __pyx_L25_except_return; - /* "kivyblocks/blocks.pyx":179 + /* "kivyblocks/blocks.pyx":178 * except Exception as e: * print_exc() * if errback: # <<<<<<<<<<<<<< @@ -6466,7 +6472,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE */ } - /* "kivyblocks/blocks.pyx":181 + /* "kivyblocks/blocks.pyx":180 * if errback: * return errback(None,e) * return None # <<<<<<<<<<<<<< @@ -6483,7 +6489,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE goto __pyx_L24_except_error; __pyx_L24_except_error:; - /* "kivyblocks/blocks.pyx":172 + /* "kivyblocks/blocks.pyx":171 * return dic * elif url.startswith('http://') or url.startswith('https://'): * try: # <<<<<<<<<<<<<< @@ -6509,7 +6515,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE goto __pyx_L0; } - /* "kivyblocks/blocks.pyx":171 + /* "kivyblocks/blocks.pyx":170 * dic = json.loads(b) * return dic * elif url.startswith('http://') or url.startswith('https://'): # <<<<<<<<<<<<<< @@ -6518,7 +6524,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE */ } - /* "kivyblocks/blocks.pyx":183 + /* "kivyblocks/blocks.pyx":182 * return None * else: * config = getConfig() # <<<<<<<<<<<<<< @@ -6526,7 +6532,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE * return self.getUrlData(url,method=method, */ /*else*/ { - __Pyx_GetModuleGlobalName(__pyx_t_8, __pyx_n_s_getConfig); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 183, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_8, __pyx_n_s_getConfig); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 182, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __pyx_t_4 = NULL; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_8))) { @@ -6540,29 +6546,29 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE } __pyx_t_3 = (__pyx_t_4) ? __Pyx_PyObject_CallOneArg(__pyx_t_8, __pyx_t_4) : __Pyx_PyObject_CallNoArg(__pyx_t_8); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 183, __pyx_L1_error) + if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 182, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __pyx_v_config = __pyx_t_3; __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":184 + /* "kivyblocks/blocks.pyx":183 * else: * config = getConfig() * url = config.uihome + url # <<<<<<<<<<<<<< * return self.getUrlData(url,method=method, * params=params, */ - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_config, __pyx_n_s_uihome); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 184, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_config, __pyx_n_s_uihome); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 183, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_8 = PyNumber_Add(__pyx_t_3, __pyx_v_url); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 184, __pyx_L1_error) + __pyx_t_8 = PyNumber_Add(__pyx_t_3, __pyx_v_url); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 183, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (!(likely(PyString_CheckExact(__pyx_t_8))||((__pyx_t_8) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected %.16s, got %.200s", "str", Py_TYPE(__pyx_t_8)->tp_name), 0))) __PYX_ERR(0, 184, __pyx_L1_error) + if (!(likely(PyString_CheckExact(__pyx_t_8))||((__pyx_t_8) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected %.16s, got %.200s", "str", Py_TYPE(__pyx_t_8)->tp_name), 0))) __PYX_ERR(0, 183, __pyx_L1_error) __Pyx_DECREF_SET(__pyx_v_url, ((PyObject*)__pyx_t_8)); __pyx_t_8 = 0; - /* "kivyblocks/blocks.pyx":185 + /* "kivyblocks/blocks.pyx":184 * config = getConfig() * url = config.uihome + url * return self.getUrlData(url,method=method, # <<<<<<<<<<<<<< @@ -6570,54 +6576,54 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE * files=files, */ __Pyx_XDECREF(__pyx_r); - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_getUrlData); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 185, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_getUrlData); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 184, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 185, __pyx_L1_error) + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 184, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_INCREF(__pyx_v_url); __Pyx_GIVEREF(__pyx_v_url); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_url); - __pyx_t_5 = __Pyx_PyDict_NewPresized(3); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 185, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyDict_NewPresized(3); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 184, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_method, __pyx_v_method) < 0) __PYX_ERR(0, 185, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_method, __pyx_v_method) < 0) __PYX_ERR(0, 184, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":186 + /* "kivyblocks/blocks.pyx":185 * url = config.uihome + url * return self.getUrlData(url,method=method, * params=params, # <<<<<<<<<<<<<< * files=files, * **kw) */ - if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_params, __pyx_v_params) < 0) __PYX_ERR(0, 185, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_params, __pyx_v_params) < 0) __PYX_ERR(0, 184, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":187 + /* "kivyblocks/blocks.pyx":186 * return self.getUrlData(url,method=method, * params=params, * files=files, # <<<<<<<<<<<<<< * **kw) * */ - if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_files, __pyx_v_files) < 0) __PYX_ERR(0, 185, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_files, __pyx_v_files) < 0) __PYX_ERR(0, 184, __pyx_L1_error) __pyx_t_4 = __pyx_t_5; __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":188 + /* "kivyblocks/blocks.pyx":187 * params=params, * files=files, * **kw) # <<<<<<<<<<<<<< * * def strValueExpr(self,s:str,localnamespace:dict={}): */ - if (__Pyx_MergeKeywords(__pyx_t_4, __pyx_v_kw) < 0) __PYX_ERR(0, 188, __pyx_L1_error) + if (__Pyx_MergeKeywords(__pyx_t_4, __pyx_v_kw) < 0) __PYX_ERR(0, 187, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":185 + /* "kivyblocks/blocks.pyx":184 * config = getConfig() * url = config.uihome + url * return self.getUrlData(url,method=method, # <<<<<<<<<<<<<< * params=params, * files=files, */ - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_3, __pyx_t_4); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 185, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_3, __pyx_t_4); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 184, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -6628,7 +6634,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE } __pyx_L5:; - /* "kivyblocks/blocks.pyx":154 + /* "kivyblocks/blocks.pyx":153 * return eval(s,g,l) * * def getUrlData(self, url:str, method:str='GET', # <<<<<<<<<<<<<< @@ -6664,7 +6670,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_10getUrlData(CYTHON_UNUSE return __pyx_r; } -/* "kivyblocks/blocks.pyx":190 +/* "kivyblocks/blocks.pyx":189 * **kw) * * def strValueExpr(self,s:str,localnamespace:dict={}): # <<<<<<<<<<<<<< @@ -6682,12 +6688,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_4__defaults__(CYTHON_UNUSED PyObj int __pyx_clineno = 0; __Pyx_RefNannySetupContext("__defaults__", 0); __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 190, __pyx_L1_error) + __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 189, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__Pyx_CyFunction_Defaults(__pyx_defaults1, __pyx_self)->__pyx_arg_localnamespace); __Pyx_GIVEREF(__Pyx_CyFunction_Defaults(__pyx_defaults1, __pyx_self)->__pyx_arg_localnamespace); PyTuple_SET_ITEM(__pyx_t_1, 0, __Pyx_CyFunction_Defaults(__pyx_defaults1, __pyx_self)->__pyx_arg_localnamespace); - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 190, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 189, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_GIVEREF(__pyx_t_1); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1); @@ -6751,7 +6757,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_13strValueExpr(PyObject * case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_s)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("strValueExpr", 0, 2, 3, 1); __PYX_ERR(0, 190, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("strValueExpr", 0, 2, 3, 1); __PYX_ERR(0, 189, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: @@ -6761,7 +6767,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_13strValueExpr(PyObject * } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "strValueExpr") < 0)) __PYX_ERR(0, 190, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "strValueExpr") < 0)) __PYX_ERR(0, 189, __pyx_L3_error) } } else { switch (PyTuple_GET_SIZE(__pyx_args)) { @@ -6779,14 +6785,14 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_13strValueExpr(PyObject * } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("strValueExpr", 0, 2, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 190, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("strValueExpr", 0, 2, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 189, __pyx_L3_error) __pyx_L3_error:; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.strValueExpr", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); return NULL; __pyx_L4_argument_unpacking_done:; - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_s), (&PyString_Type), 1, "s", 1))) __PYX_ERR(0, 190, __pyx_L1_error) - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_localnamespace), (&PyDict_Type), 1, "localnamespace", 1))) __PYX_ERR(0, 190, __pyx_L1_error) + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_s), (&PyString_Type), 1, "s", 1))) __PYX_ERR(0, 189, __pyx_L1_error) + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_localnamespace), (&PyDict_Type), 1, "localnamespace", 1))) __PYX_ERR(0, 189, __pyx_L1_error) __pyx_r = __pyx_pf_10kivyblocks_6blocks_6Blocks_12strValueExpr(__pyx_self, __pyx_v_self, __pyx_v_s, __pyx_v_localnamespace); /* function exit code */ @@ -6821,7 +6827,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12strValueExpr(CYTHON_UNU __Pyx_RefNannySetupContext("strValueExpr", 0); __Pyx_INCREF(__pyx_v_s); - /* "kivyblocks/blocks.pyx":191 + /* "kivyblocks/blocks.pyx":190 * * def strValueExpr(self,s:str,localnamespace:dict={}): * if not s.startswith('py::'): # <<<<<<<<<<<<<< @@ -6830,13 +6836,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12strValueExpr(CYTHON_UNU */ if (unlikely(__pyx_v_s == Py_None)) { PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%.30s'", "startswith"); - __PYX_ERR(0, 191, __pyx_L1_error) + __PYX_ERR(0, 190, __pyx_L1_error) } - __pyx_t_1 = __Pyx_PyStr_Tailmatch(__pyx_v_s, __pyx_kp_s_py, 0, PY_SSIZE_T_MAX, -1); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 191, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyStr_Tailmatch(__pyx_v_s, __pyx_kp_s_py, 0, PY_SSIZE_T_MAX, -1); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 190, __pyx_L1_error) __pyx_t_2 = ((!(__pyx_t_1 != 0)) != 0); if (__pyx_t_2) { - /* "kivyblocks/blocks.pyx":192 + /* "kivyblocks/blocks.pyx":191 * def strValueExpr(self,s:str,localnamespace:dict={}): * if not s.startswith('py::'): * return s # <<<<<<<<<<<<<< @@ -6848,7 +6854,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12strValueExpr(CYTHON_UNU __pyx_r = __pyx_v_s; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":191 + /* "kivyblocks/blocks.pyx":190 * * def strValueExpr(self,s:str,localnamespace:dict={}): * if not s.startswith('py::'): # <<<<<<<<<<<<<< @@ -6857,7 +6863,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12strValueExpr(CYTHON_UNU */ } - /* "kivyblocks/blocks.pyx":193 + /* "kivyblocks/blocks.pyx":192 * if not s.startswith('py::'): * return s * s = s[4:] # <<<<<<<<<<<<<< @@ -6866,14 +6872,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12strValueExpr(CYTHON_UNU */ if (unlikely(__pyx_v_s == Py_None)) { PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable"); - __PYX_ERR(0, 193, __pyx_L1_error) + __PYX_ERR(0, 192, __pyx_L1_error) } - __pyx_t_3 = PySequence_GetSlice(__pyx_v_s, 4, PY_SSIZE_T_MAX); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 193, __pyx_L1_error) + __pyx_t_3 = PySequence_GetSlice(__pyx_v_s, 4, PY_SSIZE_T_MAX); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 192, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF_SET(__pyx_v_s, ((PyObject*)__pyx_t_3)); __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":194 + /* "kivyblocks/blocks.pyx":193 * return s * s = s[4:] * try: # <<<<<<<<<<<<<< @@ -6889,14 +6895,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12strValueExpr(CYTHON_UNU __Pyx_XGOTREF(__pyx_t_6); /*try:*/ { - /* "kivyblocks/blocks.pyx":195 + /* "kivyblocks/blocks.pyx":194 * s = s[4:] * try: * v = self.eval(s,localnamespace) # <<<<<<<<<<<<<< * return v * except Exception as e: */ - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_eval); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 195, __pyx_L4_error) + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_eval); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 194, __pyx_L4_error) __Pyx_GOTREF(__pyx_t_7); __pyx_t_8 = NULL; __pyx_t_9 = 0; @@ -6913,7 +6919,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12strValueExpr(CYTHON_UNU #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_7)) { PyObject *__pyx_temp[3] = {__pyx_t_8, __pyx_v_s, __pyx_v_localnamespace}; - __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_7, __pyx_temp+1-__pyx_t_9, 2+__pyx_t_9); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 195, __pyx_L4_error) + __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_7, __pyx_temp+1-__pyx_t_9, 2+__pyx_t_9); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 194, __pyx_L4_error) __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_GOTREF(__pyx_t_3); } else @@ -6921,13 +6927,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12strValueExpr(CYTHON_UNU #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_7)) { PyObject *__pyx_temp[3] = {__pyx_t_8, __pyx_v_s, __pyx_v_localnamespace}; - __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_7, __pyx_temp+1-__pyx_t_9, 2+__pyx_t_9); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 195, __pyx_L4_error) + __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_7, __pyx_temp+1-__pyx_t_9, 2+__pyx_t_9); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 194, __pyx_L4_error) __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_GOTREF(__pyx_t_3); } else #endif { - __pyx_t_10 = PyTuple_New(2+__pyx_t_9); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 195, __pyx_L4_error) + __pyx_t_10 = PyTuple_New(2+__pyx_t_9); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 194, __pyx_L4_error) __Pyx_GOTREF(__pyx_t_10); if (__pyx_t_8) { __Pyx_GIVEREF(__pyx_t_8); PyTuple_SET_ITEM(__pyx_t_10, 0, __pyx_t_8); __pyx_t_8 = NULL; @@ -6938,7 +6944,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12strValueExpr(CYTHON_UNU __Pyx_INCREF(__pyx_v_localnamespace); __Pyx_GIVEREF(__pyx_v_localnamespace); PyTuple_SET_ITEM(__pyx_t_10, 1+__pyx_t_9, __pyx_v_localnamespace); - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_10, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 195, __pyx_L4_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_10, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 194, __pyx_L4_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; } @@ -6946,7 +6952,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12strValueExpr(CYTHON_UNU __pyx_v_v = __pyx_t_3; __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":196 + /* "kivyblocks/blocks.pyx":195 * try: * v = self.eval(s,localnamespace) * return v # <<<<<<<<<<<<<< @@ -6958,7 +6964,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12strValueExpr(CYTHON_UNU __pyx_r = __pyx_v_v; goto __pyx_L8_try_return; - /* "kivyblocks/blocks.pyx":194 + /* "kivyblocks/blocks.pyx":193 * return s * s = s[4:] * try: # <<<<<<<<<<<<<< @@ -6972,7 +6978,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12strValueExpr(CYTHON_UNU __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "kivyblocks/blocks.pyx":197 + /* "kivyblocks/blocks.pyx":196 * v = self.eval(s,localnamespace) * return v * except Exception as e: # <<<<<<<<<<<<<< @@ -6982,21 +6988,21 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12strValueExpr(CYTHON_UNU __pyx_t_9 = __Pyx_PyErr_ExceptionMatches(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); if (__pyx_t_9) { __Pyx_AddTraceback("kivyblocks.blocks.Blocks.strValueExpr", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_3, &__pyx_t_7, &__pyx_t_10) < 0) __PYX_ERR(0, 197, __pyx_L6_except_error) + if (__Pyx_GetException(&__pyx_t_3, &__pyx_t_7, &__pyx_t_10) < 0) __PYX_ERR(0, 196, __pyx_L6_except_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_GOTREF(__pyx_t_7); __Pyx_GOTREF(__pyx_t_10); __Pyx_INCREF(__pyx_t_7); __pyx_v_e = __pyx_t_7; - /* "kivyblocks/blocks.pyx":198 + /* "kivyblocks/blocks.pyx":197 * return v * except Exception as e: * print('Exception .... ',e,'script=',s) # <<<<<<<<<<<<<< * print_exc() * return s */ - __pyx_t_8 = PyTuple_New(4); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 198, __pyx_L6_except_error) + __pyx_t_8 = PyTuple_New(4); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 197, __pyx_L6_except_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_INCREF(__pyx_kp_s_Exception); __Pyx_GIVEREF(__pyx_kp_s_Exception); @@ -7010,17 +7016,17 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12strValueExpr(CYTHON_UNU __Pyx_INCREF(__pyx_v_s); __Pyx_GIVEREF(__pyx_v_s); PyTuple_SET_ITEM(__pyx_t_8, 3, __pyx_v_s); - if (__Pyx_PrintOne(0, __pyx_t_8) < 0) __PYX_ERR(0, 198, __pyx_L6_except_error) + if (__Pyx_PrintOne(0, __pyx_t_8) < 0) __PYX_ERR(0, 197, __pyx_L6_except_error) __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "kivyblocks/blocks.pyx":199 + /* "kivyblocks/blocks.pyx":198 * except Exception as e: * print('Exception .... ',e,'script=',s) * print_exc() # <<<<<<<<<<<<<< * return s * */ - __Pyx_GetModuleGlobalName(__pyx_t_11, __pyx_n_s_print_exc); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 199, __pyx_L6_except_error) + __Pyx_GetModuleGlobalName(__pyx_t_11, __pyx_n_s_print_exc); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 198, __pyx_L6_except_error) __Pyx_GOTREF(__pyx_t_11); __pyx_t_12 = NULL; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_11))) { @@ -7034,12 +7040,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12strValueExpr(CYTHON_UNU } __pyx_t_8 = (__pyx_t_12) ? __Pyx_PyObject_CallOneArg(__pyx_t_11, __pyx_t_12) : __Pyx_PyObject_CallNoArg(__pyx_t_11); __Pyx_XDECREF(__pyx_t_12); __pyx_t_12 = 0; - if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 199, __pyx_L6_except_error) + if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 198, __pyx_L6_except_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "kivyblocks/blocks.pyx":200 + /* "kivyblocks/blocks.pyx":199 * print('Exception .... ',e,'script=',s) * print_exc() * return s # <<<<<<<<<<<<<< @@ -7057,7 +7063,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12strValueExpr(CYTHON_UNU goto __pyx_L6_except_error; __pyx_L6_except_error:; - /* "kivyblocks/blocks.pyx":194 + /* "kivyblocks/blocks.pyx":193 * return s * s = s[4:] * try: # <<<<<<<<<<<<<< @@ -7083,7 +7089,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12strValueExpr(CYTHON_UNU goto __pyx_L0; } - /* "kivyblocks/blocks.pyx":190 + /* "kivyblocks/blocks.pyx":189 * **kw) * * def strValueExpr(self,s:str,localnamespace:dict={}): # <<<<<<<<<<<<<< @@ -7110,7 +7116,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12strValueExpr(CYTHON_UNU return __pyx_r; } -/* "kivyblocks/blocks.pyx":202 +/* "kivyblocks/blocks.pyx":201 * return s * * def arrayValueExpr(self,arr:list,localnamespace:dict={}) -> list: # <<<<<<<<<<<<<< @@ -7128,12 +7134,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6__defaults__(CYTHON_UNUSED PyObj int __pyx_clineno = 0; __Pyx_RefNannySetupContext("__defaults__", 0); __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 202, __pyx_L1_error) + __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 201, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__Pyx_CyFunction_Defaults(__pyx_defaults2, __pyx_self)->__pyx_arg_localnamespace); __Pyx_GIVEREF(__Pyx_CyFunction_Defaults(__pyx_defaults2, __pyx_self)->__pyx_arg_localnamespace); PyTuple_SET_ITEM(__pyx_t_1, 0, __Pyx_CyFunction_Defaults(__pyx_defaults2, __pyx_self)->__pyx_arg_localnamespace); - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 202, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 201, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_GIVEREF(__pyx_t_1); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1); @@ -7197,7 +7203,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_15arrayValueExpr(PyObject case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_arr)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("arrayValueExpr", 0, 2, 3, 1); __PYX_ERR(0, 202, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("arrayValueExpr", 0, 2, 3, 1); __PYX_ERR(0, 201, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: @@ -7207,7 +7213,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_15arrayValueExpr(PyObject } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "arrayValueExpr") < 0)) __PYX_ERR(0, 202, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "arrayValueExpr") < 0)) __PYX_ERR(0, 201, __pyx_L3_error) } } else { switch (PyTuple_GET_SIZE(__pyx_args)) { @@ -7225,14 +7231,14 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_15arrayValueExpr(PyObject } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("arrayValueExpr", 0, 2, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 202, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("arrayValueExpr", 0, 2, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 201, __pyx_L3_error) __pyx_L3_error:; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.arrayValueExpr", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); return NULL; __pyx_L4_argument_unpacking_done:; - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_arr), (&PyList_Type), 1, "arr", 1))) __PYX_ERR(0, 202, __pyx_L1_error) - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_localnamespace), (&PyDict_Type), 1, "localnamespace", 1))) __PYX_ERR(0, 202, __pyx_L1_error) + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_arr), (&PyList_Type), 1, "arr", 1))) __PYX_ERR(0, 201, __pyx_L1_error) + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_localnamespace), (&PyDict_Type), 1, "localnamespace", 1))) __PYX_ERR(0, 201, __pyx_L1_error) __pyx_r = __pyx_pf_10kivyblocks_6blocks_6Blocks_14arrayValueExpr(__pyx_self, __pyx_v_self, __pyx_v_arr, __pyx_v_localnamespace); /* function exit code */ @@ -7263,19 +7269,19 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_14arrayValueExpr(CYTHON_U int __pyx_clineno = 0; __Pyx_RefNannySetupContext("arrayValueExpr", 0); - /* "kivyblocks/blocks.pyx":203 + /* "kivyblocks/blocks.pyx":202 * * def arrayValueExpr(self,arr:list,localnamespace:dict={}) -> list: * d = [] # <<<<<<<<<<<<<< * for v in arr: * if type(v) == type(''): */ - __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 203, __pyx_L1_error) + __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 202, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_v_d = ((PyObject*)__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":204 + /* "kivyblocks/blocks.pyx":203 * def arrayValueExpr(self,arr:list,localnamespace:dict={}) -> list: * d = [] * for v in arr: # <<<<<<<<<<<<<< @@ -7284,40 +7290,40 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_14arrayValueExpr(CYTHON_U */ if (unlikely(__pyx_v_arr == Py_None)) { PyErr_SetString(PyExc_TypeError, "'NoneType' object is not iterable"); - __PYX_ERR(0, 204, __pyx_L1_error) + __PYX_ERR(0, 203, __pyx_L1_error) } __pyx_t_1 = __pyx_v_arr; __Pyx_INCREF(__pyx_t_1); __pyx_t_2 = 0; for (;;) { if (__pyx_t_2 >= PyList_GET_SIZE(__pyx_t_1)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_3 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_3); __pyx_t_2++; if (unlikely(0 < 0)) __PYX_ERR(0, 204, __pyx_L1_error) + __pyx_t_3 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_3); __pyx_t_2++; if (unlikely(0 < 0)) __PYX_ERR(0, 203, __pyx_L1_error) #else - __pyx_t_3 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 204, __pyx_L1_error) + __pyx_t_3 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 203, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); #endif __Pyx_XDECREF_SET(__pyx_v_v, __pyx_t_3); __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":205 + /* "kivyblocks/blocks.pyx":204 * d = [] * for v in arr: * if type(v) == type(''): # <<<<<<<<<<<<<< * d.append(self.strValueExpr(v,localnamespace)) * continue */ - __pyx_t_3 = PyObject_RichCompare(((PyObject *)Py_TYPE(__pyx_v_v)), ((PyObject *)Py_TYPE(__pyx_kp_s__4)), Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 205, __pyx_L1_error) - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 205, __pyx_L1_error) + __pyx_t_3 = PyObject_RichCompare(((PyObject *)Py_TYPE(__pyx_v_v)), ((PyObject *)Py_TYPE(__pyx_kp_s__4)), Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 204, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 204, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; if (__pyx_t_4) { - /* "kivyblocks/blocks.pyx":206 + /* "kivyblocks/blocks.pyx":205 * for v in arr: * if type(v) == type(''): * d.append(self.strValueExpr(v,localnamespace)) # <<<<<<<<<<<<<< * continue * if type(v) == type([]): */ - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_strValueExpr); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 206, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_strValueExpr); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 205, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __pyx_t_6 = NULL; __pyx_t_7 = 0; @@ -7334,7 +7340,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_14arrayValueExpr(CYTHON_U #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_5)) { PyObject *__pyx_temp[3] = {__pyx_t_6, __pyx_v_v, __pyx_v_localnamespace}; - __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 206, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 205, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_GOTREF(__pyx_t_3); } else @@ -7342,13 +7348,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_14arrayValueExpr(CYTHON_U #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) { PyObject *__pyx_temp[3] = {__pyx_t_6, __pyx_v_v, __pyx_v_localnamespace}; - __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 206, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 205, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_GOTREF(__pyx_t_3); } else #endif { - __pyx_t_8 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 206, __pyx_L1_error) + __pyx_t_8 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 205, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); if (__pyx_t_6) { __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_6); __pyx_t_6 = NULL; @@ -7359,15 +7365,15 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_14arrayValueExpr(CYTHON_U __Pyx_INCREF(__pyx_v_localnamespace); __Pyx_GIVEREF(__pyx_v_localnamespace); PyTuple_SET_ITEM(__pyx_t_8, 1+__pyx_t_7, __pyx_v_localnamespace); - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_8, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 206, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_8, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 205, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; } __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_9 = __Pyx_PyList_Append(__pyx_v_d, __pyx_t_3); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 206, __pyx_L1_error) + __pyx_t_9 = __Pyx_PyList_Append(__pyx_v_d, __pyx_t_3); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 205, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":207 + /* "kivyblocks/blocks.pyx":206 * if type(v) == type(''): * d.append(self.strValueExpr(v,localnamespace)) * continue # <<<<<<<<<<<<<< @@ -7376,7 +7382,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_14arrayValueExpr(CYTHON_U */ goto __pyx_L3_continue; - /* "kivyblocks/blocks.pyx":205 + /* "kivyblocks/blocks.pyx":204 * d = [] * for v in arr: * if type(v) == type(''): # <<<<<<<<<<<<<< @@ -7385,29 +7391,29 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_14arrayValueExpr(CYTHON_U */ } - /* "kivyblocks/blocks.pyx":208 + /* "kivyblocks/blocks.pyx":207 * d.append(self.strValueExpr(v,localnamespace)) * continue * if type(v) == type([]): # <<<<<<<<<<<<<< * d.append(self.arrayValueExpr(v,localnamespace)) * continue */ - __pyx_t_3 = PyList_New(0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 208, __pyx_L1_error) + __pyx_t_3 = PyList_New(0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 207, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_5 = PyObject_RichCompare(((PyObject *)Py_TYPE(__pyx_v_v)), ((PyObject *)Py_TYPE(__pyx_t_3)), Py_EQ); __Pyx_XGOTREF(__pyx_t_5); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 208, __pyx_L1_error) + __pyx_t_5 = PyObject_RichCompare(((PyObject *)Py_TYPE(__pyx_v_v)), ((PyObject *)Py_TYPE(__pyx_t_3)), Py_EQ); __Pyx_XGOTREF(__pyx_t_5); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 207, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 208, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 207, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; if (__pyx_t_4) { - /* "kivyblocks/blocks.pyx":209 + /* "kivyblocks/blocks.pyx":208 * continue * if type(v) == type([]): * d.append(self.arrayValueExpr(v,localnamespace)) # <<<<<<<<<<<<<< * continue * if type(v) == type({}): */ - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_arrayValueExpr); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 209, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_arrayValueExpr); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 208, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_8 = NULL; __pyx_t_7 = 0; @@ -7424,7 +7430,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_14arrayValueExpr(CYTHON_U #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_3)) { PyObject *__pyx_temp[3] = {__pyx_t_8, __pyx_v_v, __pyx_v_localnamespace}; - __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 209, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 208, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_GOTREF(__pyx_t_5); } else @@ -7432,13 +7438,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_14arrayValueExpr(CYTHON_U #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_3)) { PyObject *__pyx_temp[3] = {__pyx_t_8, __pyx_v_v, __pyx_v_localnamespace}; - __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 209, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 208, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_GOTREF(__pyx_t_5); } else #endif { - __pyx_t_6 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 209, __pyx_L1_error) + __pyx_t_6 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 208, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); if (__pyx_t_8) { __Pyx_GIVEREF(__pyx_t_8); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_8); __pyx_t_8 = NULL; @@ -7449,15 +7455,15 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_14arrayValueExpr(CYTHON_U __Pyx_INCREF(__pyx_v_localnamespace); __Pyx_GIVEREF(__pyx_v_localnamespace); PyTuple_SET_ITEM(__pyx_t_6, 1+__pyx_t_7, __pyx_v_localnamespace); - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 209, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 208, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; } __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_9 = __Pyx_PyList_Append(__pyx_v_d, __pyx_t_5); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 209, __pyx_L1_error) + __pyx_t_9 = __Pyx_PyList_Append(__pyx_v_d, __pyx_t_5); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 208, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":210 + /* "kivyblocks/blocks.pyx":209 * if type(v) == type([]): * d.append(self.arrayValueExpr(v,localnamespace)) * continue # <<<<<<<<<<<<<< @@ -7466,7 +7472,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_14arrayValueExpr(CYTHON_U */ goto __pyx_L3_continue; - /* "kivyblocks/blocks.pyx":208 + /* "kivyblocks/blocks.pyx":207 * d.append(self.strValueExpr(v,localnamespace)) * continue * if type(v) == type([]): # <<<<<<<<<<<<<< @@ -7475,29 +7481,29 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_14arrayValueExpr(CYTHON_U */ } - /* "kivyblocks/blocks.pyx":211 + /* "kivyblocks/blocks.pyx":210 * d.append(self.arrayValueExpr(v,localnamespace)) * continue * if type(v) == type({}): # <<<<<<<<<<<<<< * d.append(self.dictValueExpr(v,localnamespace)) * continue */ - __pyx_t_5 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 211, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 210, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_3 = PyObject_RichCompare(((PyObject *)Py_TYPE(__pyx_v_v)), ((PyObject *)Py_TYPE(__pyx_t_5)), Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 211, __pyx_L1_error) + __pyx_t_3 = PyObject_RichCompare(((PyObject *)Py_TYPE(__pyx_v_v)), ((PyObject *)Py_TYPE(__pyx_t_5)), Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 210, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 211, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 210, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; if (__pyx_t_4) { - /* "kivyblocks/blocks.pyx":212 + /* "kivyblocks/blocks.pyx":211 * continue * if type(v) == type({}): * d.append(self.dictValueExpr(v,localnamespace)) # <<<<<<<<<<<<<< * continue * if type(v) == type(DictObject): */ - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_dictValueExpr); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 212, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_dictValueExpr); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 211, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __pyx_t_6 = NULL; __pyx_t_7 = 0; @@ -7514,7 +7520,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_14arrayValueExpr(CYTHON_U #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_5)) { PyObject *__pyx_temp[3] = {__pyx_t_6, __pyx_v_v, __pyx_v_localnamespace}; - __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 212, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 211, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_GOTREF(__pyx_t_3); } else @@ -7522,13 +7528,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_14arrayValueExpr(CYTHON_U #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) { PyObject *__pyx_temp[3] = {__pyx_t_6, __pyx_v_v, __pyx_v_localnamespace}; - __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 212, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 211, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_GOTREF(__pyx_t_3); } else #endif { - __pyx_t_8 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 212, __pyx_L1_error) + __pyx_t_8 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 211, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); if (__pyx_t_6) { __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_6); __pyx_t_6 = NULL; @@ -7539,15 +7545,15 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_14arrayValueExpr(CYTHON_U __Pyx_INCREF(__pyx_v_localnamespace); __Pyx_GIVEREF(__pyx_v_localnamespace); PyTuple_SET_ITEM(__pyx_t_8, 1+__pyx_t_7, __pyx_v_localnamespace); - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_8, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 212, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_8, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 211, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; } __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_9 = __Pyx_PyList_Append(__pyx_v_d, __pyx_t_3); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 212, __pyx_L1_error) + __pyx_t_9 = __Pyx_PyList_Append(__pyx_v_d, __pyx_t_3); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 211, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":213 + /* "kivyblocks/blocks.pyx":212 * if type(v) == type({}): * d.append(self.dictValueExpr(v,localnamespace)) * continue # <<<<<<<<<<<<<< @@ -7556,7 +7562,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_14arrayValueExpr(CYTHON_U */ goto __pyx_L3_continue; - /* "kivyblocks/blocks.pyx":211 + /* "kivyblocks/blocks.pyx":210 * d.append(self.arrayValueExpr(v,localnamespace)) * continue * if type(v) == type({}): # <<<<<<<<<<<<<< @@ -7565,29 +7571,29 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_14arrayValueExpr(CYTHON_U */ } - /* "kivyblocks/blocks.pyx":214 + /* "kivyblocks/blocks.pyx":213 * d.append(self.dictValueExpr(v,localnamespace)) * continue * if type(v) == type(DictObject): # <<<<<<<<<<<<<< * d.append(self.dictValueExpr(v,localnamespace)) * continue */ - __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_DictObject); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 214, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_DictObject); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 213, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_5 = PyObject_RichCompare(((PyObject *)Py_TYPE(__pyx_v_v)), ((PyObject *)Py_TYPE(__pyx_t_3)), Py_EQ); __Pyx_XGOTREF(__pyx_t_5); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 214, __pyx_L1_error) + __pyx_t_5 = PyObject_RichCompare(((PyObject *)Py_TYPE(__pyx_v_v)), ((PyObject *)Py_TYPE(__pyx_t_3)), Py_EQ); __Pyx_XGOTREF(__pyx_t_5); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 213, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 214, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 213, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; if (__pyx_t_4) { - /* "kivyblocks/blocks.pyx":215 + /* "kivyblocks/blocks.pyx":214 * continue * if type(v) == type(DictObject): * d.append(self.dictValueExpr(v,localnamespace)) # <<<<<<<<<<<<<< * continue * d.append(v) */ - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_dictValueExpr); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 215, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_dictValueExpr); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 214, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_8 = NULL; __pyx_t_7 = 0; @@ -7604,7 +7610,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_14arrayValueExpr(CYTHON_U #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_3)) { PyObject *__pyx_temp[3] = {__pyx_t_8, __pyx_v_v, __pyx_v_localnamespace}; - __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 215, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 214, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_GOTREF(__pyx_t_5); } else @@ -7612,13 +7618,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_14arrayValueExpr(CYTHON_U #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_3)) { PyObject *__pyx_temp[3] = {__pyx_t_8, __pyx_v_v, __pyx_v_localnamespace}; - __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 215, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 214, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_GOTREF(__pyx_t_5); } else #endif { - __pyx_t_6 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 215, __pyx_L1_error) + __pyx_t_6 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 214, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); if (__pyx_t_8) { __Pyx_GIVEREF(__pyx_t_8); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_8); __pyx_t_8 = NULL; @@ -7629,15 +7635,15 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_14arrayValueExpr(CYTHON_U __Pyx_INCREF(__pyx_v_localnamespace); __Pyx_GIVEREF(__pyx_v_localnamespace); PyTuple_SET_ITEM(__pyx_t_6, 1+__pyx_t_7, __pyx_v_localnamespace); - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 215, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 214, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; } __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_9 = __Pyx_PyList_Append(__pyx_v_d, __pyx_t_5); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 215, __pyx_L1_error) + __pyx_t_9 = __Pyx_PyList_Append(__pyx_v_d, __pyx_t_5); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 214, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":216 + /* "kivyblocks/blocks.pyx":215 * if type(v) == type(DictObject): * d.append(self.dictValueExpr(v,localnamespace)) * continue # <<<<<<<<<<<<<< @@ -7646,7 +7652,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_14arrayValueExpr(CYTHON_U */ goto __pyx_L3_continue; - /* "kivyblocks/blocks.pyx":214 + /* "kivyblocks/blocks.pyx":213 * d.append(self.dictValueExpr(v,localnamespace)) * continue * if type(v) == type(DictObject): # <<<<<<<<<<<<<< @@ -7655,16 +7661,16 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_14arrayValueExpr(CYTHON_U */ } - /* "kivyblocks/blocks.pyx":217 + /* "kivyblocks/blocks.pyx":216 * d.append(self.dictValueExpr(v,localnamespace)) * continue * d.append(v) # <<<<<<<<<<<<<< * return d * */ - __pyx_t_9 = __Pyx_PyList_Append(__pyx_v_d, __pyx_v_v); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 217, __pyx_L1_error) + __pyx_t_9 = __Pyx_PyList_Append(__pyx_v_d, __pyx_v_v); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 216, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":204 + /* "kivyblocks/blocks.pyx":203 * def arrayValueExpr(self,arr:list,localnamespace:dict={}) -> list: * d = [] * for v in arr: # <<<<<<<<<<<<<< @@ -7675,7 +7681,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_14arrayValueExpr(CYTHON_U } __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":218 + /* "kivyblocks/blocks.pyx":217 * continue * d.append(v) * return d # <<<<<<<<<<<<<< @@ -7687,7 +7693,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_14arrayValueExpr(CYTHON_U __pyx_r = __pyx_v_d; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":202 + /* "kivyblocks/blocks.pyx":201 * return s * * def arrayValueExpr(self,arr:list,localnamespace:dict={}) -> list: # <<<<<<<<<<<<<< @@ -7712,7 +7718,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_14arrayValueExpr(CYTHON_U return __pyx_r; } -/* "kivyblocks/blocks.pyx":220 +/* "kivyblocks/blocks.pyx":219 * return d * * def dictValueExpr(self,dic:dict,localnamespace:dict={}) -> dict: # <<<<<<<<<<<<<< @@ -7730,12 +7736,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_8__defaults__(CYTHON_UNUSED PyObj int __pyx_clineno = 0; __Pyx_RefNannySetupContext("__defaults__", 0); __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 220, __pyx_L1_error) + __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 219, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__Pyx_CyFunction_Defaults(__pyx_defaults3, __pyx_self)->__pyx_arg_localnamespace); __Pyx_GIVEREF(__Pyx_CyFunction_Defaults(__pyx_defaults3, __pyx_self)->__pyx_arg_localnamespace); PyTuple_SET_ITEM(__pyx_t_1, 0, __Pyx_CyFunction_Defaults(__pyx_defaults3, __pyx_self)->__pyx_arg_localnamespace); - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 220, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 219, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_GIVEREF(__pyx_t_1); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1); @@ -7799,7 +7805,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_17dictValueExpr(PyObject case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_dic)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("dictValueExpr", 0, 2, 3, 1); __PYX_ERR(0, 220, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("dictValueExpr", 0, 2, 3, 1); __PYX_ERR(0, 219, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: @@ -7809,7 +7815,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_17dictValueExpr(PyObject } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "dictValueExpr") < 0)) __PYX_ERR(0, 220, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "dictValueExpr") < 0)) __PYX_ERR(0, 219, __pyx_L3_error) } } else { switch (PyTuple_GET_SIZE(__pyx_args)) { @@ -7827,14 +7833,14 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_17dictValueExpr(PyObject } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("dictValueExpr", 0, 2, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 220, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("dictValueExpr", 0, 2, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 219, __pyx_L3_error) __pyx_L3_error:; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.dictValueExpr", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); return NULL; __pyx_L4_argument_unpacking_done:; - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_dic), (&PyDict_Type), 1, "dic", 1))) __PYX_ERR(0, 220, __pyx_L1_error) - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_localnamespace), (&PyDict_Type), 1, "localnamespace", 1))) __PYX_ERR(0, 220, __pyx_L1_error) + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_dic), (&PyDict_Type), 1, "dic", 1))) __PYX_ERR(0, 219, __pyx_L1_error) + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_localnamespace), (&PyDict_Type), 1, "localnamespace", 1))) __PYX_ERR(0, 219, __pyx_L1_error) __pyx_r = __pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(__pyx_self, __pyx_v_self, __pyx_v_dic, __pyx_v_localnamespace); /* function exit code */ @@ -7867,19 +7873,19 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN int __pyx_clineno = 0; __Pyx_RefNannySetupContext("dictValueExpr", 0); - /* "kivyblocks/blocks.pyx":221 + /* "kivyblocks/blocks.pyx":220 * * def dictValueExpr(self,dic:dict,localnamespace:dict={}) -> dict: * d = {} # <<<<<<<<<<<<<< * for k,v in dic.items(): * if type(v) == type(''): */ - __pyx_t_1 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 221, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 220, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_v_d = ((PyObject*)__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":222 + /* "kivyblocks/blocks.pyx":221 * def dictValueExpr(self,dic:dict,localnamespace:dict={}) -> dict: * d = {} * for k,v in dic.items(): # <<<<<<<<<<<<<< @@ -7888,17 +7894,17 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN */ if (unlikely(__pyx_v_dic == Py_None)) { PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%.30s'", "items"); - __PYX_ERR(0, 222, __pyx_L1_error) + __PYX_ERR(0, 221, __pyx_L1_error) } - __pyx_t_1 = __Pyx_PyDict_Items(__pyx_v_dic); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 222, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyDict_Items(__pyx_v_dic); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 221, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); if (likely(PyList_CheckExact(__pyx_t_1)) || PyTuple_CheckExact(__pyx_t_1)) { __pyx_t_2 = __pyx_t_1; __Pyx_INCREF(__pyx_t_2); __pyx_t_3 = 0; __pyx_t_4 = NULL; } else { - __pyx_t_3 = -1; __pyx_t_2 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 222, __pyx_L1_error) + __pyx_t_3 = -1; __pyx_t_2 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 221, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_4 = Py_TYPE(__pyx_t_2)->tp_iternext; if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 222, __pyx_L1_error) + __pyx_t_4 = Py_TYPE(__pyx_t_2)->tp_iternext; if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 221, __pyx_L1_error) } __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; for (;;) { @@ -7906,17 +7912,17 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN if (likely(PyList_CheckExact(__pyx_t_2))) { if (__pyx_t_3 >= PyList_GET_SIZE(__pyx_t_2)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_1 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_3); __Pyx_INCREF(__pyx_t_1); __pyx_t_3++; if (unlikely(0 < 0)) __PYX_ERR(0, 222, __pyx_L1_error) + __pyx_t_1 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_3); __Pyx_INCREF(__pyx_t_1); __pyx_t_3++; if (unlikely(0 < 0)) __PYX_ERR(0, 221, __pyx_L1_error) #else - __pyx_t_1 = PySequence_ITEM(__pyx_t_2, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 222, __pyx_L1_error) + __pyx_t_1 = PySequence_ITEM(__pyx_t_2, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 221, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); #endif } else { if (__pyx_t_3 >= PyTuple_GET_SIZE(__pyx_t_2)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_1 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_3); __Pyx_INCREF(__pyx_t_1); __pyx_t_3++; if (unlikely(0 < 0)) __PYX_ERR(0, 222, __pyx_L1_error) + __pyx_t_1 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_3); __Pyx_INCREF(__pyx_t_1); __pyx_t_3++; if (unlikely(0 < 0)) __PYX_ERR(0, 221, __pyx_L1_error) #else - __pyx_t_1 = PySequence_ITEM(__pyx_t_2, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 222, __pyx_L1_error) + __pyx_t_1 = PySequence_ITEM(__pyx_t_2, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 221, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); #endif } @@ -7926,7 +7932,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN PyObject* exc_type = PyErr_Occurred(); if (exc_type) { if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); - else __PYX_ERR(0, 222, __pyx_L1_error) + else __PYX_ERR(0, 221, __pyx_L1_error) } break; } @@ -7938,7 +7944,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN if (unlikely(size != 2)) { if (size > 2) __Pyx_RaiseTooManyValuesError(2); else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size); - __PYX_ERR(0, 222, __pyx_L1_error) + __PYX_ERR(0, 221, __pyx_L1_error) } #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS if (likely(PyTuple_CheckExact(sequence))) { @@ -7951,15 +7957,15 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN __Pyx_INCREF(__pyx_t_5); __Pyx_INCREF(__pyx_t_6); #else - __pyx_t_5 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 222, __pyx_L1_error) + __pyx_t_5 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 221, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_6 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 222, __pyx_L1_error) + __pyx_t_6 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 221, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); #endif __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; } else { Py_ssize_t index = -1; - __pyx_t_7 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 222, __pyx_L1_error) + __pyx_t_7 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 221, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_t_8 = Py_TYPE(__pyx_t_7)->tp_iternext; @@ -7967,7 +7973,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN __Pyx_GOTREF(__pyx_t_5); index = 1; __pyx_t_6 = __pyx_t_8(__pyx_t_7); if (unlikely(!__pyx_t_6)) goto __pyx_L5_unpacking_failed; __Pyx_GOTREF(__pyx_t_6); - if (__Pyx_IternextUnpackEndCheck(__pyx_t_8(__pyx_t_7), 2) < 0) __PYX_ERR(0, 222, __pyx_L1_error) + if (__Pyx_IternextUnpackEndCheck(__pyx_t_8(__pyx_t_7), 2) < 0) __PYX_ERR(0, 221, __pyx_L1_error) __pyx_t_8 = NULL; __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; goto __pyx_L6_unpacking_done; @@ -7975,7 +7981,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; __pyx_t_8 = NULL; if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index); - __PYX_ERR(0, 222, __pyx_L1_error) + __PYX_ERR(0, 221, __pyx_L1_error) __pyx_L6_unpacking_done:; } __Pyx_XDECREF_SET(__pyx_v_k, __pyx_t_5); @@ -7983,26 +7989,26 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN __Pyx_XDECREF_SET(__pyx_v_v, __pyx_t_6); __pyx_t_6 = 0; - /* "kivyblocks/blocks.pyx":223 + /* "kivyblocks/blocks.pyx":222 * d = {} * for k,v in dic.items(): * if type(v) == type(''): # <<<<<<<<<<<<<< * d[k] = self.strValueExpr(v,localnamespace) * continue */ - __pyx_t_1 = PyObject_RichCompare(((PyObject *)Py_TYPE(__pyx_v_v)), ((PyObject *)Py_TYPE(__pyx_kp_s__4)), Py_EQ); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 223, __pyx_L1_error) - __pyx_t_9 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_9 < 0)) __PYX_ERR(0, 223, __pyx_L1_error) + __pyx_t_1 = PyObject_RichCompare(((PyObject *)Py_TYPE(__pyx_v_v)), ((PyObject *)Py_TYPE(__pyx_kp_s__4)), Py_EQ); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 222, __pyx_L1_error) + __pyx_t_9 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_9 < 0)) __PYX_ERR(0, 222, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; if (__pyx_t_9) { - /* "kivyblocks/blocks.pyx":224 + /* "kivyblocks/blocks.pyx":223 * for k,v in dic.items(): * if type(v) == type(''): * d[k] = self.strValueExpr(v,localnamespace) # <<<<<<<<<<<<<< * continue * if type(v) == type([]): */ - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_strValueExpr); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 224, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_strValueExpr); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 223, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __pyx_t_5 = NULL; __pyx_t_10 = 0; @@ -8019,7 +8025,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_6)) { PyObject *__pyx_temp[3] = {__pyx_t_5, __pyx_v_v, __pyx_v_localnamespace}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_6, __pyx_temp+1-__pyx_t_10, 2+__pyx_t_10); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 224, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_6, __pyx_temp+1-__pyx_t_10, 2+__pyx_t_10); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 223, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_GOTREF(__pyx_t_1); } else @@ -8027,13 +8033,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_6)) { PyObject *__pyx_temp[3] = {__pyx_t_5, __pyx_v_v, __pyx_v_localnamespace}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_6, __pyx_temp+1-__pyx_t_10, 2+__pyx_t_10); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 224, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_6, __pyx_temp+1-__pyx_t_10, 2+__pyx_t_10); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 223, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_GOTREF(__pyx_t_1); } else #endif { - __pyx_t_7 = PyTuple_New(2+__pyx_t_10); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 224, __pyx_L1_error) + __pyx_t_7 = PyTuple_New(2+__pyx_t_10); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 223, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); if (__pyx_t_5) { __Pyx_GIVEREF(__pyx_t_5); PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_5); __pyx_t_5 = NULL; @@ -8044,15 +8050,15 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN __Pyx_INCREF(__pyx_v_localnamespace); __Pyx_GIVEREF(__pyx_v_localnamespace); PyTuple_SET_ITEM(__pyx_t_7, 1+__pyx_t_10, __pyx_v_localnamespace); - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_7, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 224, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_7, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 223, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; } __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - if (unlikely(PyDict_SetItem(__pyx_v_d, __pyx_v_k, __pyx_t_1) < 0)) __PYX_ERR(0, 224, __pyx_L1_error) + if (unlikely(PyDict_SetItem(__pyx_v_d, __pyx_v_k, __pyx_t_1) < 0)) __PYX_ERR(0, 223, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":225 + /* "kivyblocks/blocks.pyx":224 * if type(v) == type(''): * d[k] = self.strValueExpr(v,localnamespace) * continue # <<<<<<<<<<<<<< @@ -8061,7 +8067,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN */ goto __pyx_L3_continue; - /* "kivyblocks/blocks.pyx":223 + /* "kivyblocks/blocks.pyx":222 * d = {} * for k,v in dic.items(): * if type(v) == type(''): # <<<<<<<<<<<<<< @@ -8070,29 +8076,29 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN */ } - /* "kivyblocks/blocks.pyx":226 + /* "kivyblocks/blocks.pyx":225 * d[k] = self.strValueExpr(v,localnamespace) * continue * if type(v) == type([]): # <<<<<<<<<<<<<< * d[k] = self.arrayValueExpr(v,localnamespace) * continue */ - __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 226, __pyx_L1_error) + __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 225, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_6 = PyObject_RichCompare(((PyObject *)Py_TYPE(__pyx_v_v)), ((PyObject *)Py_TYPE(__pyx_t_1)), Py_EQ); __Pyx_XGOTREF(__pyx_t_6); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 226, __pyx_L1_error) + __pyx_t_6 = PyObject_RichCompare(((PyObject *)Py_TYPE(__pyx_v_v)), ((PyObject *)Py_TYPE(__pyx_t_1)), Py_EQ); __Pyx_XGOTREF(__pyx_t_6); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 225, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_9 = __Pyx_PyObject_IsTrue(__pyx_t_6); if (unlikely(__pyx_t_9 < 0)) __PYX_ERR(0, 226, __pyx_L1_error) + __pyx_t_9 = __Pyx_PyObject_IsTrue(__pyx_t_6); if (unlikely(__pyx_t_9 < 0)) __PYX_ERR(0, 225, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; if (__pyx_t_9) { - /* "kivyblocks/blocks.pyx":227 + /* "kivyblocks/blocks.pyx":226 * continue * if type(v) == type([]): * d[k] = self.arrayValueExpr(v,localnamespace) # <<<<<<<<<<<<<< * continue * if type(v) == type({}): */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_arrayValueExpr); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 227, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_arrayValueExpr); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 226, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_t_7 = NULL; __pyx_t_10 = 0; @@ -8109,7 +8115,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_1)) { PyObject *__pyx_temp[3] = {__pyx_t_7, __pyx_v_v, __pyx_v_localnamespace}; - __pyx_t_6 = __Pyx_PyFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_10, 2+__pyx_t_10); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 227, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_10, 2+__pyx_t_10); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 226, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_GOTREF(__pyx_t_6); } else @@ -8117,13 +8123,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_1)) { PyObject *__pyx_temp[3] = {__pyx_t_7, __pyx_v_v, __pyx_v_localnamespace}; - __pyx_t_6 = __Pyx_PyCFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_10, 2+__pyx_t_10); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 227, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyCFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_10, 2+__pyx_t_10); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 226, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_GOTREF(__pyx_t_6); } else #endif { - __pyx_t_5 = PyTuple_New(2+__pyx_t_10); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 227, __pyx_L1_error) + __pyx_t_5 = PyTuple_New(2+__pyx_t_10); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 226, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); if (__pyx_t_7) { __Pyx_GIVEREF(__pyx_t_7); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_7); __pyx_t_7 = NULL; @@ -8134,15 +8140,15 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN __Pyx_INCREF(__pyx_v_localnamespace); __Pyx_GIVEREF(__pyx_v_localnamespace); PyTuple_SET_ITEM(__pyx_t_5, 1+__pyx_t_10, __pyx_v_localnamespace); - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_5, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 227, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_5, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 226, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; } __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(PyDict_SetItem(__pyx_v_d, __pyx_v_k, __pyx_t_6) < 0)) __PYX_ERR(0, 227, __pyx_L1_error) + if (unlikely(PyDict_SetItem(__pyx_v_d, __pyx_v_k, __pyx_t_6) < 0)) __PYX_ERR(0, 226, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - /* "kivyblocks/blocks.pyx":228 + /* "kivyblocks/blocks.pyx":227 * if type(v) == type([]): * d[k] = self.arrayValueExpr(v,localnamespace) * continue # <<<<<<<<<<<<<< @@ -8151,7 +8157,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN */ goto __pyx_L3_continue; - /* "kivyblocks/blocks.pyx":226 + /* "kivyblocks/blocks.pyx":225 * d[k] = self.strValueExpr(v,localnamespace) * continue * if type(v) == type([]): # <<<<<<<<<<<<<< @@ -8160,29 +8166,29 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN */ } - /* "kivyblocks/blocks.pyx":229 + /* "kivyblocks/blocks.pyx":228 * d[k] = self.arrayValueExpr(v,localnamespace) * continue * if type(v) == type({}): # <<<<<<<<<<<<<< * d[k] = self.dictValueExpr(v,localnamespace) * continue */ - __pyx_t_6 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 229, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 228, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - __pyx_t_1 = PyObject_RichCompare(((PyObject *)Py_TYPE(__pyx_v_v)), ((PyObject *)Py_TYPE(__pyx_t_6)), Py_EQ); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 229, __pyx_L1_error) + __pyx_t_1 = PyObject_RichCompare(((PyObject *)Py_TYPE(__pyx_v_v)), ((PyObject *)Py_TYPE(__pyx_t_6)), Py_EQ); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 228, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __pyx_t_9 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_9 < 0)) __PYX_ERR(0, 229, __pyx_L1_error) + __pyx_t_9 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_9 < 0)) __PYX_ERR(0, 228, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; if (__pyx_t_9) { - /* "kivyblocks/blocks.pyx":230 + /* "kivyblocks/blocks.pyx":229 * continue * if type(v) == type({}): * d[k] = self.dictValueExpr(v,localnamespace) # <<<<<<<<<<<<<< * continue * if type(v) == type(DictObject): */ - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_dictValueExpr); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 230, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_dictValueExpr); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 229, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __pyx_t_5 = NULL; __pyx_t_10 = 0; @@ -8199,7 +8205,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_6)) { PyObject *__pyx_temp[3] = {__pyx_t_5, __pyx_v_v, __pyx_v_localnamespace}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_6, __pyx_temp+1-__pyx_t_10, 2+__pyx_t_10); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 230, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_6, __pyx_temp+1-__pyx_t_10, 2+__pyx_t_10); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 229, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_GOTREF(__pyx_t_1); } else @@ -8207,13 +8213,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_6)) { PyObject *__pyx_temp[3] = {__pyx_t_5, __pyx_v_v, __pyx_v_localnamespace}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_6, __pyx_temp+1-__pyx_t_10, 2+__pyx_t_10); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 230, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_6, __pyx_temp+1-__pyx_t_10, 2+__pyx_t_10); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 229, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_GOTREF(__pyx_t_1); } else #endif { - __pyx_t_7 = PyTuple_New(2+__pyx_t_10); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 230, __pyx_L1_error) + __pyx_t_7 = PyTuple_New(2+__pyx_t_10); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 229, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); if (__pyx_t_5) { __Pyx_GIVEREF(__pyx_t_5); PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_5); __pyx_t_5 = NULL; @@ -8224,15 +8230,15 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN __Pyx_INCREF(__pyx_v_localnamespace); __Pyx_GIVEREF(__pyx_v_localnamespace); PyTuple_SET_ITEM(__pyx_t_7, 1+__pyx_t_10, __pyx_v_localnamespace); - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_7, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 230, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_7, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 229, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; } __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - if (unlikely(PyDict_SetItem(__pyx_v_d, __pyx_v_k, __pyx_t_1) < 0)) __PYX_ERR(0, 230, __pyx_L1_error) + if (unlikely(PyDict_SetItem(__pyx_v_d, __pyx_v_k, __pyx_t_1) < 0)) __PYX_ERR(0, 229, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":231 + /* "kivyblocks/blocks.pyx":230 * if type(v) == type({}): * d[k] = self.dictValueExpr(v,localnamespace) * continue # <<<<<<<<<<<<<< @@ -8241,7 +8247,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN */ goto __pyx_L3_continue; - /* "kivyblocks/blocks.pyx":229 + /* "kivyblocks/blocks.pyx":228 * d[k] = self.arrayValueExpr(v,localnamespace) * continue * if type(v) == type({}): # <<<<<<<<<<<<<< @@ -8250,29 +8256,29 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN */ } - /* "kivyblocks/blocks.pyx":232 + /* "kivyblocks/blocks.pyx":231 * d[k] = self.dictValueExpr(v,localnamespace) * continue * if type(v) == type(DictObject): # <<<<<<<<<<<<<< * d[k] = self.dictValueExpr(v,localnamespace) * continue */ - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_DictObject); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 232, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_DictObject); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 231, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_6 = PyObject_RichCompare(((PyObject *)Py_TYPE(__pyx_v_v)), ((PyObject *)Py_TYPE(__pyx_t_1)), Py_EQ); __Pyx_XGOTREF(__pyx_t_6); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 232, __pyx_L1_error) + __pyx_t_6 = PyObject_RichCompare(((PyObject *)Py_TYPE(__pyx_v_v)), ((PyObject *)Py_TYPE(__pyx_t_1)), Py_EQ); __Pyx_XGOTREF(__pyx_t_6); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 231, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_9 = __Pyx_PyObject_IsTrue(__pyx_t_6); if (unlikely(__pyx_t_9 < 0)) __PYX_ERR(0, 232, __pyx_L1_error) + __pyx_t_9 = __Pyx_PyObject_IsTrue(__pyx_t_6); if (unlikely(__pyx_t_9 < 0)) __PYX_ERR(0, 231, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; if (__pyx_t_9) { - /* "kivyblocks/blocks.pyx":233 + /* "kivyblocks/blocks.pyx":232 * continue * if type(v) == type(DictObject): * d[k] = self.dictValueExpr(v,localnamespace) # <<<<<<<<<<<<<< * continue * d[k] = v */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_dictValueExpr); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 233, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_dictValueExpr); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 232, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_t_7 = NULL; __pyx_t_10 = 0; @@ -8289,7 +8295,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_1)) { PyObject *__pyx_temp[3] = {__pyx_t_7, __pyx_v_v, __pyx_v_localnamespace}; - __pyx_t_6 = __Pyx_PyFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_10, 2+__pyx_t_10); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 233, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_10, 2+__pyx_t_10); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 232, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_GOTREF(__pyx_t_6); } else @@ -8297,13 +8303,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_1)) { PyObject *__pyx_temp[3] = {__pyx_t_7, __pyx_v_v, __pyx_v_localnamespace}; - __pyx_t_6 = __Pyx_PyCFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_10, 2+__pyx_t_10); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 233, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyCFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_10, 2+__pyx_t_10); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 232, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_GOTREF(__pyx_t_6); } else #endif { - __pyx_t_5 = PyTuple_New(2+__pyx_t_10); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 233, __pyx_L1_error) + __pyx_t_5 = PyTuple_New(2+__pyx_t_10); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 232, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); if (__pyx_t_7) { __Pyx_GIVEREF(__pyx_t_7); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_7); __pyx_t_7 = NULL; @@ -8314,15 +8320,15 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN __Pyx_INCREF(__pyx_v_localnamespace); __Pyx_GIVEREF(__pyx_v_localnamespace); PyTuple_SET_ITEM(__pyx_t_5, 1+__pyx_t_10, __pyx_v_localnamespace); - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_5, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 233, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_5, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 232, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; } __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(PyDict_SetItem(__pyx_v_d, __pyx_v_k, __pyx_t_6) < 0)) __PYX_ERR(0, 233, __pyx_L1_error) + if (unlikely(PyDict_SetItem(__pyx_v_d, __pyx_v_k, __pyx_t_6) < 0)) __PYX_ERR(0, 232, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - /* "kivyblocks/blocks.pyx":234 + /* "kivyblocks/blocks.pyx":233 * if type(v) == type(DictObject): * d[k] = self.dictValueExpr(v,localnamespace) * continue # <<<<<<<<<<<<<< @@ -8331,7 +8337,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN */ goto __pyx_L3_continue; - /* "kivyblocks/blocks.pyx":232 + /* "kivyblocks/blocks.pyx":231 * d[k] = self.dictValueExpr(v,localnamespace) * continue * if type(v) == type(DictObject): # <<<<<<<<<<<<<< @@ -8340,16 +8346,16 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN */ } - /* "kivyblocks/blocks.pyx":235 + /* "kivyblocks/blocks.pyx":234 * d[k] = self.dictValueExpr(v,localnamespace) * continue * d[k] = v # <<<<<<<<<<<<<< * return d * def valueExpr(self,obj,localnamespace:dict={}): */ - if (unlikely(PyDict_SetItem(__pyx_v_d, __pyx_v_k, __pyx_v_v) < 0)) __PYX_ERR(0, 235, __pyx_L1_error) + if (unlikely(PyDict_SetItem(__pyx_v_d, __pyx_v_k, __pyx_v_v) < 0)) __PYX_ERR(0, 234, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":222 + /* "kivyblocks/blocks.pyx":221 * def dictValueExpr(self,dic:dict,localnamespace:dict={}) -> dict: * d = {} * for k,v in dic.items(): # <<<<<<<<<<<<<< @@ -8360,7 +8366,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN } __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":236 + /* "kivyblocks/blocks.pyx":235 * continue * d[k] = v * return d # <<<<<<<<<<<<<< @@ -8372,7 +8378,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN __pyx_r = __pyx_v_d; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":220 + /* "kivyblocks/blocks.pyx":219 * return d * * def dictValueExpr(self,dic:dict,localnamespace:dict={}) -> dict: # <<<<<<<<<<<<<< @@ -8398,7 +8404,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_16dictValueExpr(CYTHON_UN return __pyx_r; } -/* "kivyblocks/blocks.pyx":237 +/* "kivyblocks/blocks.pyx":236 * d[k] = v * return d * def valueExpr(self,obj,localnamespace:dict={}): # <<<<<<<<<<<<<< @@ -8416,12 +8422,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_10__defaults__(CYTHON_UNUSED PyOb int __pyx_clineno = 0; __Pyx_RefNannySetupContext("__defaults__", 0); __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 237, __pyx_L1_error) + __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 236, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__Pyx_CyFunction_Defaults(__pyx_defaults4, __pyx_self)->__pyx_arg_localnamespace); __Pyx_GIVEREF(__Pyx_CyFunction_Defaults(__pyx_defaults4, __pyx_self)->__pyx_arg_localnamespace); PyTuple_SET_ITEM(__pyx_t_1, 0, __Pyx_CyFunction_Defaults(__pyx_defaults4, __pyx_self)->__pyx_arg_localnamespace); - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 237, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 236, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_GIVEREF(__pyx_t_1); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1); @@ -8485,7 +8491,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_19valueExpr(PyObject *__p case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_obj)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("valueExpr", 0, 2, 3, 1); __PYX_ERR(0, 237, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("valueExpr", 0, 2, 3, 1); __PYX_ERR(0, 236, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: @@ -8495,7 +8501,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_19valueExpr(PyObject *__p } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "valueExpr") < 0)) __PYX_ERR(0, 237, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "valueExpr") < 0)) __PYX_ERR(0, 236, __pyx_L3_error) } } else { switch (PyTuple_GET_SIZE(__pyx_args)) { @@ -8513,13 +8519,13 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_19valueExpr(PyObject *__p } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("valueExpr", 0, 2, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 237, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("valueExpr", 0, 2, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 236, __pyx_L3_error) __pyx_L3_error:; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.valueExpr", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); return NULL; __pyx_L4_argument_unpacking_done:; - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_localnamespace), (&PyDict_Type), 1, "localnamespace", 1))) __PYX_ERR(0, 237, __pyx_L1_error) + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_localnamespace), (&PyDict_Type), 1, "localnamespace", 1))) __PYX_ERR(0, 236, __pyx_L1_error) __pyx_r = __pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(__pyx_self, __pyx_v_self, __pyx_v_obj, __pyx_v_localnamespace); /* function exit code */ @@ -8546,19 +8552,19 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED int __pyx_clineno = 0; __Pyx_RefNannySetupContext("valueExpr", 0); - /* "kivyblocks/blocks.pyx":238 + /* "kivyblocks/blocks.pyx":237 * return d * def valueExpr(self,obj,localnamespace:dict={}): * if type(obj) == type(''): # <<<<<<<<<<<<<< * return self.strValueExpr(obj,localnamespace) * if type(obj) == type([]): */ - __pyx_t_1 = PyObject_RichCompare(((PyObject *)Py_TYPE(__pyx_v_obj)), ((PyObject *)Py_TYPE(__pyx_kp_s__4)), Py_EQ); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 238, __pyx_L1_error) - __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 238, __pyx_L1_error) + __pyx_t_1 = PyObject_RichCompare(((PyObject *)Py_TYPE(__pyx_v_obj)), ((PyObject *)Py_TYPE(__pyx_kp_s__4)), Py_EQ); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 237, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 237, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; if (__pyx_t_2) { - /* "kivyblocks/blocks.pyx":239 + /* "kivyblocks/blocks.pyx":238 * def valueExpr(self,obj,localnamespace:dict={}): * if type(obj) == type(''): * return self.strValueExpr(obj,localnamespace) # <<<<<<<<<<<<<< @@ -8566,7 +8572,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED * return self.arrayValueExpr(obj,localnamespace) */ __Pyx_XDECREF(__pyx_r); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_strValueExpr); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 239, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_strValueExpr); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 238, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_4 = NULL; __pyx_t_5 = 0; @@ -8583,7 +8589,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_3)) { PyObject *__pyx_temp[3] = {__pyx_t_4, __pyx_v_obj, __pyx_v_localnamespace}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 239, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 238, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_GOTREF(__pyx_t_1); } else @@ -8591,13 +8597,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_3)) { PyObject *__pyx_temp[3] = {__pyx_t_4, __pyx_v_obj, __pyx_v_localnamespace}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 239, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 238, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_GOTREF(__pyx_t_1); } else #endif { - __pyx_t_6 = PyTuple_New(2+__pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 239, __pyx_L1_error) + __pyx_t_6 = PyTuple_New(2+__pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 238, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); if (__pyx_t_4) { __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_4); __pyx_t_4 = NULL; @@ -8608,7 +8614,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED __Pyx_INCREF(__pyx_v_localnamespace); __Pyx_GIVEREF(__pyx_v_localnamespace); PyTuple_SET_ITEM(__pyx_t_6, 1+__pyx_t_5, __pyx_v_localnamespace); - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 239, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 238, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; } @@ -8617,7 +8623,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED __pyx_t_1 = 0; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":238 + /* "kivyblocks/blocks.pyx":237 * return d * def valueExpr(self,obj,localnamespace:dict={}): * if type(obj) == type(''): # <<<<<<<<<<<<<< @@ -8626,22 +8632,22 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED */ } - /* "kivyblocks/blocks.pyx":240 + /* "kivyblocks/blocks.pyx":239 * if type(obj) == type(''): * return self.strValueExpr(obj,localnamespace) * if type(obj) == type([]): # <<<<<<<<<<<<<< * return self.arrayValueExpr(obj,localnamespace) * if type(obj) == type({}): */ - __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 240, __pyx_L1_error) + __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 239, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyObject_RichCompare(((PyObject *)Py_TYPE(__pyx_v_obj)), ((PyObject *)Py_TYPE(__pyx_t_1)), Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 240, __pyx_L1_error) + __pyx_t_3 = PyObject_RichCompare(((PyObject *)Py_TYPE(__pyx_v_obj)), ((PyObject *)Py_TYPE(__pyx_t_1)), Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 239, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 240, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 239, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; if (__pyx_t_2) { - /* "kivyblocks/blocks.pyx":241 + /* "kivyblocks/blocks.pyx":240 * return self.strValueExpr(obj,localnamespace) * if type(obj) == type([]): * return self.arrayValueExpr(obj,localnamespace) # <<<<<<<<<<<<<< @@ -8649,7 +8655,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED * return self.dictValueExpr(obj,localnamespace) */ __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_arrayValueExpr); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 241, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_arrayValueExpr); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 240, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_t_6 = NULL; __pyx_t_5 = 0; @@ -8666,7 +8672,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_1)) { PyObject *__pyx_temp[3] = {__pyx_t_6, __pyx_v_obj, __pyx_v_localnamespace}; - __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 241, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 240, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_GOTREF(__pyx_t_3); } else @@ -8674,13 +8680,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_1)) { PyObject *__pyx_temp[3] = {__pyx_t_6, __pyx_v_obj, __pyx_v_localnamespace}; - __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 241, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 240, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_GOTREF(__pyx_t_3); } else #endif { - __pyx_t_4 = PyTuple_New(2+__pyx_t_5); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 241, __pyx_L1_error) + __pyx_t_4 = PyTuple_New(2+__pyx_t_5); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 240, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); if (__pyx_t_6) { __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_6); __pyx_t_6 = NULL; @@ -8691,7 +8697,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED __Pyx_INCREF(__pyx_v_localnamespace); __Pyx_GIVEREF(__pyx_v_localnamespace); PyTuple_SET_ITEM(__pyx_t_4, 1+__pyx_t_5, __pyx_v_localnamespace); - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 241, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 240, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; } @@ -8700,7 +8706,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED __pyx_t_3 = 0; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":240 + /* "kivyblocks/blocks.pyx":239 * if type(obj) == type(''): * return self.strValueExpr(obj,localnamespace) * if type(obj) == type([]): # <<<<<<<<<<<<<< @@ -8709,22 +8715,22 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED */ } - /* "kivyblocks/blocks.pyx":242 + /* "kivyblocks/blocks.pyx":241 * if type(obj) == type([]): * return self.arrayValueExpr(obj,localnamespace) * if type(obj) == type({}): # <<<<<<<<<<<<<< * return self.dictValueExpr(obj,localnamespace) * if isinstance(obj,DictObject): */ - __pyx_t_3 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 242, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 241, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_1 = PyObject_RichCompare(((PyObject *)Py_TYPE(__pyx_v_obj)), ((PyObject *)Py_TYPE(__pyx_t_3)), Py_EQ); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 242, __pyx_L1_error) + __pyx_t_1 = PyObject_RichCompare(((PyObject *)Py_TYPE(__pyx_v_obj)), ((PyObject *)Py_TYPE(__pyx_t_3)), Py_EQ); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 241, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 242, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 241, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; if (__pyx_t_2) { - /* "kivyblocks/blocks.pyx":243 + /* "kivyblocks/blocks.pyx":242 * return self.arrayValueExpr(obj,localnamespace) * if type(obj) == type({}): * return self.dictValueExpr(obj,localnamespace) # <<<<<<<<<<<<<< @@ -8732,7 +8738,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED * return self.dictValueExpr(obj,localnamespace) */ __Pyx_XDECREF(__pyx_r); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_dictValueExpr); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 243, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_dictValueExpr); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 242, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_4 = NULL; __pyx_t_5 = 0; @@ -8749,7 +8755,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_3)) { PyObject *__pyx_temp[3] = {__pyx_t_4, __pyx_v_obj, __pyx_v_localnamespace}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 243, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 242, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_GOTREF(__pyx_t_1); } else @@ -8757,13 +8763,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_3)) { PyObject *__pyx_temp[3] = {__pyx_t_4, __pyx_v_obj, __pyx_v_localnamespace}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 243, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 242, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_GOTREF(__pyx_t_1); } else #endif { - __pyx_t_6 = PyTuple_New(2+__pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 243, __pyx_L1_error) + __pyx_t_6 = PyTuple_New(2+__pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 242, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); if (__pyx_t_4) { __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_4); __pyx_t_4 = NULL; @@ -8774,7 +8780,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED __Pyx_INCREF(__pyx_v_localnamespace); __Pyx_GIVEREF(__pyx_v_localnamespace); PyTuple_SET_ITEM(__pyx_t_6, 1+__pyx_t_5, __pyx_v_localnamespace); - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 243, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 242, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; } @@ -8783,7 +8789,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED __pyx_t_1 = 0; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":242 + /* "kivyblocks/blocks.pyx":241 * if type(obj) == type([]): * return self.arrayValueExpr(obj,localnamespace) * if type(obj) == type({}): # <<<<<<<<<<<<<< @@ -8792,21 +8798,21 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED */ } - /* "kivyblocks/blocks.pyx":244 + /* "kivyblocks/blocks.pyx":243 * if type(obj) == type({}): * return self.dictValueExpr(obj,localnamespace) * if isinstance(obj,DictObject): # <<<<<<<<<<<<<< * return self.dictValueExpr(obj,localnamespace) * return obj */ - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_DictObject); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 244, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_DictObject); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 243, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = PyObject_IsInstance(__pyx_v_obj, __pyx_t_1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 244, __pyx_L1_error) + __pyx_t_2 = PyObject_IsInstance(__pyx_v_obj, __pyx_t_1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 243, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_t_7 = (__pyx_t_2 != 0); if (__pyx_t_7) { - /* "kivyblocks/blocks.pyx":245 + /* "kivyblocks/blocks.pyx":244 * return self.dictValueExpr(obj,localnamespace) * if isinstance(obj,DictObject): * return self.dictValueExpr(obj,localnamespace) # <<<<<<<<<<<<<< @@ -8814,7 +8820,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED * */ __Pyx_XDECREF(__pyx_r); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_dictValueExpr); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 245, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_dictValueExpr); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 244, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_6 = NULL; __pyx_t_5 = 0; @@ -8831,7 +8837,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_3)) { PyObject *__pyx_temp[3] = {__pyx_t_6, __pyx_v_obj, __pyx_v_localnamespace}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 245, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 244, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_GOTREF(__pyx_t_1); } else @@ -8839,13 +8845,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_3)) { PyObject *__pyx_temp[3] = {__pyx_t_6, __pyx_v_obj, __pyx_v_localnamespace}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 245, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 244, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_GOTREF(__pyx_t_1); } else #endif { - __pyx_t_4 = PyTuple_New(2+__pyx_t_5); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 245, __pyx_L1_error) + __pyx_t_4 = PyTuple_New(2+__pyx_t_5); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 244, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); if (__pyx_t_6) { __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_6); __pyx_t_6 = NULL; @@ -8856,7 +8862,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED __Pyx_INCREF(__pyx_v_localnamespace); __Pyx_GIVEREF(__pyx_v_localnamespace); PyTuple_SET_ITEM(__pyx_t_4, 1+__pyx_t_5, __pyx_v_localnamespace); - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 245, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 244, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; } @@ -8865,7 +8871,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED __pyx_t_1 = 0; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":244 + /* "kivyblocks/blocks.pyx":243 * if type(obj) == type({}): * return self.dictValueExpr(obj,localnamespace) * if isinstance(obj,DictObject): # <<<<<<<<<<<<<< @@ -8874,7 +8880,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED */ } - /* "kivyblocks/blocks.pyx":246 + /* "kivyblocks/blocks.pyx":245 * if isinstance(obj,DictObject): * return self.dictValueExpr(obj,localnamespace) * return obj # <<<<<<<<<<<<<< @@ -8886,7 +8892,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED __pyx_r = __pyx_v_obj; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":237 + /* "kivyblocks/blocks.pyx":236 * d[k] = v * return d * def valueExpr(self,obj,localnamespace:dict={}): # <<<<<<<<<<<<<< @@ -8908,7 +8914,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_18valueExpr(CYTHON_UNUSED return __pyx_r; } -/* "kivyblocks/blocks.pyx":248 +/* "kivyblocks/blocks.pyx":247 * return obj * * def w_build(self,desc) -> Widget: # <<<<<<<<<<<<<< @@ -8951,11 +8957,11 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_21w_build(PyObject *__pyx case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_desc)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("w_build", 1, 2, 2, 1); __PYX_ERR(0, 248, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("w_build", 1, 2, 2, 1); __PYX_ERR(0, 247, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "w_build") < 0)) __PYX_ERR(0, 248, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "w_build") < 0)) __PYX_ERR(0, 247, __pyx_L3_error) } } else if (PyTuple_GET_SIZE(__pyx_args) != 2) { goto __pyx_L5_argtuple_error; @@ -8968,7 +8974,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_21w_build(PyObject *__pyx } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("w_build", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 248, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("w_build", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 247, __pyx_L3_error) __pyx_L3_error:; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.w_build", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); @@ -9011,42 +9017,42 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P int __pyx_clineno = 0; __Pyx_RefNannySetupContext("w_build", 0); - /* "kivyblocks/blocks.pyx":250 + /* "kivyblocks/blocks.pyx":249 * def w_build(self,desc) -> Widget: * # print('w_build(),desc=',desc) * widgetClass = desc.get('widgettype',None) # <<<<<<<<<<<<<< * if not widgetClass: * Logger.info("Block: w_build(), desc invalid", desc) */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 250, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 249, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_tuple__5, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 250, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_tuple__5, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 249, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_widgetClass = __pyx_t_2; __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":251 + /* "kivyblocks/blocks.pyx":250 * # print('w_build(),desc=',desc) * widgetClass = desc.get('widgettype',None) * if not widgetClass: # <<<<<<<<<<<<<< * Logger.info("Block: w_build(), desc invalid", desc) * raise Exception(desc) */ - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_widgetClass); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 251, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_widgetClass); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 250, __pyx_L1_error) __pyx_t_4 = ((!__pyx_t_3) != 0); if (unlikely(__pyx_t_4)) { - /* "kivyblocks/blocks.pyx":252 + /* "kivyblocks/blocks.pyx":251 * widgetClass = desc.get('widgettype',None) * if not widgetClass: * Logger.info("Block: w_build(), desc invalid", desc) # <<<<<<<<<<<<<< * raise Exception(desc) * */ - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_Logger); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 252, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_Logger); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 251, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_info); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 252, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_info); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 251, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_t_1 = NULL; @@ -9064,7 +9070,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_5)) { PyObject *__pyx_temp[3] = {__pyx_t_1, __pyx_kp_s_Block_w_build_desc_invalid, __pyx_v_desc}; - __pyx_t_2 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 252, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 251, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_GOTREF(__pyx_t_2); } else @@ -9072,13 +9078,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) { PyObject *__pyx_temp[3] = {__pyx_t_1, __pyx_kp_s_Block_w_build_desc_invalid, __pyx_v_desc}; - __pyx_t_2 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 252, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 251, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_GOTREF(__pyx_t_2); } else #endif { - __pyx_t_7 = PyTuple_New(2+__pyx_t_6); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 252, __pyx_L1_error) + __pyx_t_7 = PyTuple_New(2+__pyx_t_6); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 251, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); if (__pyx_t_1) { __Pyx_GIVEREF(__pyx_t_1); PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_1); __pyx_t_1 = NULL; @@ -9089,27 +9095,27 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P __Pyx_INCREF(__pyx_v_desc); __Pyx_GIVEREF(__pyx_v_desc); PyTuple_SET_ITEM(__pyx_t_7, 1+__pyx_t_6, __pyx_v_desc); - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_7, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 252, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_7, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 251, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; } __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":253 + /* "kivyblocks/blocks.pyx":252 * if not widgetClass: * Logger.info("Block: w_build(), desc invalid", desc) * raise Exception(desc) # <<<<<<<<<<<<<< * * widgetClass = desc['widgettype'] */ - __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])), __pyx_v_desc); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 253, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])), __pyx_v_desc); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 252, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_Raise(__pyx_t_2, 0, 0, 0); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __PYX_ERR(0, 253, __pyx_L1_error) + __PYX_ERR(0, 252, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":251 + /* "kivyblocks/blocks.pyx":250 * # print('w_build(),desc=',desc) * widgetClass = desc.get('widgettype',None) * if not widgetClass: # <<<<<<<<<<<<<< @@ -9118,30 +9124,30 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P */ } - /* "kivyblocks/blocks.pyx":255 + /* "kivyblocks/blocks.pyx":254 * raise Exception(desc) * * widgetClass = desc['widgettype'] # <<<<<<<<<<<<<< * opts = self.valueExpr(desc.get('options',{}).copy()) * widget = None */ - __pyx_t_2 = __Pyx_PyObject_Dict_GetItem(__pyx_v_desc, __pyx_n_s_widgettype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 255, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_Dict_GetItem(__pyx_v_desc, __pyx_n_s_widgettype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 254, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF_SET(__pyx_v_widgetClass, __pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":256 + /* "kivyblocks/blocks.pyx":255 * * widgetClass = desc['widgettype'] * opts = self.valueExpr(desc.get('options',{}).copy()) # <<<<<<<<<<<<<< * widget = None * try: */ - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_valueExpr); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 256, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_valueExpr); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 255, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 256, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 255, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); - __pyx_t_9 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 256, __pyx_L1_error) + __pyx_t_9 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 255, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_9); __pyx_t_10 = NULL; __pyx_t_6 = 0; @@ -9158,7 +9164,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_8)) { PyObject *__pyx_temp[3] = {__pyx_t_10, __pyx_n_s_options, __pyx_t_9}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 256, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 255, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; @@ -9167,14 +9173,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_8)) { PyObject *__pyx_temp[3] = {__pyx_t_10, __pyx_n_s_options, __pyx_t_9}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 256, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 255, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; } else #endif { - __pyx_t_11 = PyTuple_New(2+__pyx_t_6); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 256, __pyx_L1_error) + __pyx_t_11 = PyTuple_New(2+__pyx_t_6); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 255, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_11); if (__pyx_t_10) { __Pyx_GIVEREF(__pyx_t_10); PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_t_10); __pyx_t_10 = NULL; @@ -9185,12 +9191,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P __Pyx_GIVEREF(__pyx_t_9); PyTuple_SET_ITEM(__pyx_t_11, 1+__pyx_t_6, __pyx_t_9); __pyx_t_9 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_11, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 256, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_11, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 255, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; } __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_copy); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 256, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_copy); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 255, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_t_1 = NULL; @@ -9205,7 +9211,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P } __pyx_t_7 = (__pyx_t_1) ? __Pyx_PyObject_CallOneArg(__pyx_t_8, __pyx_t_1) : __Pyx_PyObject_CallNoArg(__pyx_t_8); __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 256, __pyx_L1_error) + if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 255, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __pyx_t_8 = NULL; @@ -9221,13 +9227,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P __pyx_t_2 = (__pyx_t_8) ? __Pyx_PyObject_Call2Args(__pyx_t_5, __pyx_t_8, __pyx_t_7) : __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_7); __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 256, __pyx_L1_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 255, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_v_opts = __pyx_t_2; __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":257 + /* "kivyblocks/blocks.pyx":256 * widgetClass = desc['widgettype'] * opts = self.valueExpr(desc.get('options',{}).copy()) * widget = None # <<<<<<<<<<<<<< @@ -9237,7 +9243,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P __Pyx_INCREF(Py_None); __pyx_v_widget = Py_None; - /* "kivyblocks/blocks.pyx":258 + /* "kivyblocks/blocks.pyx":257 * opts = self.valueExpr(desc.get('options',{}).copy()) * widget = None * try: # <<<<<<<<<<<<<< @@ -9253,16 +9259,16 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P __Pyx_XGOTREF(__pyx_t_14); /*try:*/ { - /* "kivyblocks/blocks.pyx":259 + /* "kivyblocks/blocks.pyx":258 * widget = None * try: * klass = Factory.get(widgetClass) # <<<<<<<<<<<<<< * widget = klass(**opts) * except Exception as e: */ - __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_Factory); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 259, __pyx_L4_error) + __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_Factory); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 258, __pyx_L4_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_get); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 259, __pyx_L4_error) + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_get); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 258, __pyx_L4_error) __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_t_5 = NULL; @@ -9277,13 +9283,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P } __pyx_t_2 = (__pyx_t_5) ? __Pyx_PyObject_Call2Args(__pyx_t_7, __pyx_t_5, __pyx_v_widgetClass) : __Pyx_PyObject_CallOneArg(__pyx_t_7, __pyx_v_widgetClass); __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 259, __pyx_L4_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 258, __pyx_L4_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; __pyx_v_klass = __pyx_t_2; __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":260 + /* "kivyblocks/blocks.pyx":259 * try: * klass = Factory.get(widgetClass) * widget = klass(**opts) # <<<<<<<<<<<<<< @@ -9292,22 +9298,22 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P */ if (unlikely(__pyx_v_opts == Py_None)) { PyErr_SetString(PyExc_TypeError, "argument after ** must be a mapping, not NoneType"); - __PYX_ERR(0, 260, __pyx_L4_error) + __PYX_ERR(0, 259, __pyx_L4_error) } if (likely(PyDict_CheckExact(__pyx_v_opts))) { - __pyx_t_2 = PyDict_Copy(__pyx_v_opts); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 260, __pyx_L4_error) + __pyx_t_2 = PyDict_Copy(__pyx_v_opts); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 259, __pyx_L4_error) __Pyx_GOTREF(__pyx_t_2); } else { - __pyx_t_2 = PyObject_CallFunctionObjArgs((PyObject*)&PyDict_Type, __pyx_v_opts, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 260, __pyx_L4_error) + __pyx_t_2 = PyObject_CallFunctionObjArgs((PyObject*)&PyDict_Type, __pyx_v_opts, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 259, __pyx_L4_error) __Pyx_GOTREF(__pyx_t_2); } - __pyx_t_7 = __Pyx_PyObject_Call(__pyx_v_klass, __pyx_empty_tuple, __pyx_t_2); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 260, __pyx_L4_error) + __pyx_t_7 = __Pyx_PyObject_Call(__pyx_v_klass, __pyx_empty_tuple, __pyx_t_2); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 259, __pyx_L4_error) __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF_SET(__pyx_v_widget, __pyx_t_7); __pyx_t_7 = 0; - /* "kivyblocks/blocks.pyx":258 + /* "kivyblocks/blocks.pyx":257 * opts = self.valueExpr(desc.get('options',{}).copy()) * widget = None * try: # <<<<<<<<<<<<<< @@ -9329,7 +9335,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; - /* "kivyblocks/blocks.pyx":261 + /* "kivyblocks/blocks.pyx":260 * klass = Factory.get(widgetClass) * widget = klass(**opts) * except Exception as e: # <<<<<<<<<<<<<< @@ -9339,21 +9345,21 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P __pyx_t_6 = __Pyx_PyErr_ExceptionMatches(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); if (__pyx_t_6) { __Pyx_AddTraceback("kivyblocks.blocks.Blocks.w_build", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_7, &__pyx_t_2, &__pyx_t_5) < 0) __PYX_ERR(0, 261, __pyx_L6_except_error) + if (__Pyx_GetException(&__pyx_t_7, &__pyx_t_2, &__pyx_t_5) < 0) __PYX_ERR(0, 260, __pyx_L6_except_error) __Pyx_GOTREF(__pyx_t_7); __Pyx_GOTREF(__pyx_t_2); __Pyx_GOTREF(__pyx_t_5); __Pyx_INCREF(__pyx_t_2); __pyx_v_e = __pyx_t_2; - /* "kivyblocks/blocks.pyx":262 + /* "kivyblocks/blocks.pyx":261 * widget = klass(**opts) * except Exception as e: * print('Error:',widgetClass,'contructon error') # <<<<<<<<<<<<<< * print_exc() * raise NotExistsObject(widgetClass) */ - __pyx_t_8 = PyTuple_New(3); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 262, __pyx_L6_except_error) + __pyx_t_8 = PyTuple_New(3); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 261, __pyx_L6_except_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_INCREF(__pyx_kp_s_Error); __Pyx_GIVEREF(__pyx_kp_s_Error); @@ -9364,17 +9370,17 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P __Pyx_INCREF(__pyx_kp_s_contructon_error); __Pyx_GIVEREF(__pyx_kp_s_contructon_error); PyTuple_SET_ITEM(__pyx_t_8, 2, __pyx_kp_s_contructon_error); - if (__Pyx_PrintOne(0, __pyx_t_8) < 0) __PYX_ERR(0, 262, __pyx_L6_except_error) + if (__Pyx_PrintOne(0, __pyx_t_8) < 0) __PYX_ERR(0, 261, __pyx_L6_except_error) __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "kivyblocks/blocks.pyx":263 + /* "kivyblocks/blocks.pyx":262 * except Exception as e: * print('Error:',widgetClass,'contructon error') * print_exc() # <<<<<<<<<<<<<< * raise NotExistsObject(widgetClass) * */ - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_print_exc); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 263, __pyx_L6_except_error) + __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_print_exc); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 262, __pyx_L6_except_error) __Pyx_GOTREF(__pyx_t_1); __pyx_t_11 = NULL; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_1))) { @@ -9388,19 +9394,19 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P } __pyx_t_8 = (__pyx_t_11) ? __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_t_11) : __Pyx_PyObject_CallNoArg(__pyx_t_1); __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0; - if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 263, __pyx_L6_except_error) + if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 262, __pyx_L6_except_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "kivyblocks/blocks.pyx":264 + /* "kivyblocks/blocks.pyx":263 * print('Error:',widgetClass,'contructon error') * print_exc() * raise NotExistsObject(widgetClass) # <<<<<<<<<<<<<< * * if desc.get('id'): */ - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_NotExistsObject); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 264, __pyx_L6_except_error) + __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_NotExistsObject); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 263, __pyx_L6_except_error) __Pyx_GOTREF(__pyx_t_1); __pyx_t_11 = NULL; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_1))) { @@ -9414,17 +9420,17 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P } __pyx_t_8 = (__pyx_t_11) ? __Pyx_PyObject_Call2Args(__pyx_t_1, __pyx_t_11, __pyx_v_widgetClass) : __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_v_widgetClass); __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0; - if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 264, __pyx_L6_except_error) + if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 263, __pyx_L6_except_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_Raise(__pyx_t_8, 0, 0, 0); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - __PYX_ERR(0, 264, __pyx_L6_except_error) + __PYX_ERR(0, 263, __pyx_L6_except_error) } goto __pyx_L6_except_error; __pyx_L6_except_error:; - /* "kivyblocks/blocks.pyx":258 + /* "kivyblocks/blocks.pyx":257 * opts = self.valueExpr(desc.get('options',{}).copy()) * widget = None * try: # <<<<<<<<<<<<<< @@ -9439,14 +9445,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P __pyx_L9_try_end:; } - /* "kivyblocks/blocks.pyx":266 + /* "kivyblocks/blocks.pyx":265 * raise NotExistsObject(widgetClass) * * if desc.get('id'): # <<<<<<<<<<<<<< * id = desc.get('id') * if id.startswith('app.'): */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 266, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 265, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_7 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { @@ -9460,21 +9466,21 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P } __pyx_t_5 = (__pyx_t_7) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_7, __pyx_n_s_id) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_n_s_id); __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; - if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 266, __pyx_L1_error) + if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 265, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 266, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 265, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; if (__pyx_t_4) { - /* "kivyblocks/blocks.pyx":267 + /* "kivyblocks/blocks.pyx":266 * * if desc.get('id'): * id = desc.get('id') # <<<<<<<<<<<<<< * if id.startswith('app.'): * app = App.get_running_app() */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 267, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 266, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_7 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { @@ -9488,20 +9494,20 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P } __pyx_t_5 = (__pyx_t_7) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_7, __pyx_n_s_id) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_n_s_id); __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; - if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 267, __pyx_L1_error) + if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 266, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_v_id = __pyx_t_5; __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":268 + /* "kivyblocks/blocks.pyx":267 * if desc.get('id'): * id = desc.get('id') * if id.startswith('app.'): # <<<<<<<<<<<<<< * app = App.get_running_app() * id = id[4:] */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_id, __pyx_n_s_startswith); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 268, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_id, __pyx_n_s_startswith); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 267, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_7 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { @@ -9515,23 +9521,23 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P } __pyx_t_5 = (__pyx_t_7) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_7, __pyx_kp_s_app) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_kp_s_app); __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; - if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 268, __pyx_L1_error) + if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 267, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 268, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 267, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; if (__pyx_t_4) { - /* "kivyblocks/blocks.pyx":269 + /* "kivyblocks/blocks.pyx":268 * id = desc.get('id') * if id.startswith('app.'): * app = App.get_running_app() # <<<<<<<<<<<<<< * id = id[4:] * setattr(app, id, widget) */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_App); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 269, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_App); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 268, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_get_running_app); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 269, __pyx_L1_error) + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_get_running_app); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 268, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_t_2 = NULL; @@ -9546,34 +9552,34 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P } __pyx_t_5 = (__pyx_t_2) ? __Pyx_PyObject_CallOneArg(__pyx_t_7, __pyx_t_2) : __Pyx_PyObject_CallNoArg(__pyx_t_7); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 269, __pyx_L1_error) + if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 268, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; __pyx_v_app = __pyx_t_5; __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":270 + /* "kivyblocks/blocks.pyx":269 * if id.startswith('app.'): * app = App.get_running_app() * id = id[4:] # <<<<<<<<<<<<<< * setattr(app, id, widget) * if id.startswith('root.'): */ - __pyx_t_5 = __Pyx_PyObject_GetSlice(__pyx_v_id, 4, 0, NULL, NULL, &__pyx_slice__6, 1, 0, 1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 270, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetSlice(__pyx_v_id, 4, 0, NULL, NULL, &__pyx_slice__6, 1, 0, 1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 269, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF_SET(__pyx_v_id, __pyx_t_5); __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":271 + /* "kivyblocks/blocks.pyx":270 * app = App.get_running_app() * id = id[4:] * setattr(app, id, widget) # <<<<<<<<<<<<<< * if id.startswith('root.'): * app = App.get_running_app() */ - __pyx_t_15 = PyObject_SetAttr(__pyx_v_app, __pyx_v_id, __pyx_v_widget); if (unlikely(__pyx_t_15 == ((int)-1))) __PYX_ERR(0, 271, __pyx_L1_error) + __pyx_t_15 = PyObject_SetAttr(__pyx_v_app, __pyx_v_id, __pyx_v_widget); if (unlikely(__pyx_t_15 == ((int)-1))) __PYX_ERR(0, 270, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":268 + /* "kivyblocks/blocks.pyx":267 * if desc.get('id'): * id = desc.get('id') * if id.startswith('app.'): # <<<<<<<<<<<<<< @@ -9582,14 +9588,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P */ } - /* "kivyblocks/blocks.pyx":272 + /* "kivyblocks/blocks.pyx":271 * id = id[4:] * setattr(app, id, widget) * if id.startswith('root.'): # <<<<<<<<<<<<<< * app = App.get_running_app() * id = id[5:] */ - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_id, __pyx_n_s_startswith); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 272, __pyx_L1_error) + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_id, __pyx_n_s_startswith); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 271, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __pyx_t_2 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_7))) { @@ -9603,23 +9609,23 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P } __pyx_t_5 = (__pyx_t_2) ? __Pyx_PyObject_Call2Args(__pyx_t_7, __pyx_t_2, __pyx_kp_s_root) : __Pyx_PyObject_CallOneArg(__pyx_t_7, __pyx_kp_s_root); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 272, __pyx_L1_error) + if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 271, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 272, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 271, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; if (__pyx_t_4) { - /* "kivyblocks/blocks.pyx":273 + /* "kivyblocks/blocks.pyx":272 * setattr(app, id, widget) * if id.startswith('root.'): * app = App.get_running_app() # <<<<<<<<<<<<<< * id = id[5:] * setattr(app.root, id, widget) */ - __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_n_s_App); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 273, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_n_s_App); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 272, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_get_running_app); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 273, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_get_running_app); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 272, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; __pyx_t_7 = NULL; @@ -9634,37 +9640,37 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P } __pyx_t_5 = (__pyx_t_7) ? __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_t_7) : __Pyx_PyObject_CallNoArg(__pyx_t_2); __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; - if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 273, __pyx_L1_error) + if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 272, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_XDECREF_SET(__pyx_v_app, __pyx_t_5); __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":274 + /* "kivyblocks/blocks.pyx":273 * if id.startswith('root.'): * app = App.get_running_app() * id = id[5:] # <<<<<<<<<<<<<< * setattr(app.root, id, widget) * */ - __pyx_t_5 = __Pyx_PyObject_GetSlice(__pyx_v_id, 5, 0, NULL, NULL, &__pyx_slice__7, 1, 0, 1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 274, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetSlice(__pyx_v_id, 5, 0, NULL, NULL, &__pyx_slice__7, 1, 0, 1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 273, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF_SET(__pyx_v_id, __pyx_t_5); __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":275 + /* "kivyblocks/blocks.pyx":274 * app = App.get_running_app() * id = id[5:] * setattr(app.root, id, widget) # <<<<<<<<<<<<<< * * if '.' in id: */ - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_app, __pyx_n_s_root_2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 275, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_app, __pyx_n_s_root_2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 274, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_15 = PyObject_SetAttr(__pyx_t_5, __pyx_v_id, __pyx_v_widget); if (unlikely(__pyx_t_15 == ((int)-1))) __PYX_ERR(0, 275, __pyx_L1_error) + __pyx_t_15 = PyObject_SetAttr(__pyx_t_5, __pyx_v_id, __pyx_v_widget); if (unlikely(__pyx_t_15 == ((int)-1))) __PYX_ERR(0, 274, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":272 + /* "kivyblocks/blocks.pyx":271 * id = id[4:] * setattr(app, id, widget) * if id.startswith('root.'): # <<<<<<<<<<<<<< @@ -9673,27 +9679,27 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P */ } - /* "kivyblocks/blocks.pyx":277 + /* "kivyblocks/blocks.pyx":276 * setattr(app.root, id, widget) * * if '.' in id: # <<<<<<<<<<<<<< * Logger.info('widget id(%s) can not contain "."', id) * else: */ - __pyx_t_4 = (__Pyx_PySequence_ContainsTF(__pyx_kp_s__8, __pyx_v_id, Py_EQ)); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 277, __pyx_L1_error) + __pyx_t_4 = (__Pyx_PySequence_ContainsTF(__pyx_kp_s__8, __pyx_v_id, Py_EQ)); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 276, __pyx_L1_error) __pyx_t_3 = (__pyx_t_4 != 0); if (__pyx_t_3) { - /* "kivyblocks/blocks.pyx":278 + /* "kivyblocks/blocks.pyx":277 * * if '.' in id: * Logger.info('widget id(%s) can not contain "."', id) # <<<<<<<<<<<<<< * else: * widget.widget_id = id */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Logger); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 278, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Logger); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 277, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_info); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 278, __pyx_L1_error) + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_info); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 277, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_t_2 = NULL; @@ -9711,7 +9717,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_7)) { PyObject *__pyx_temp[3] = {__pyx_t_2, __pyx_kp_s_widget_id_s_can_not_contain, __pyx_v_id}; - __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_7, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 278, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_7, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 277, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_GOTREF(__pyx_t_5); } else @@ -9719,13 +9725,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_7)) { PyObject *__pyx_temp[3] = {__pyx_t_2, __pyx_kp_s_widget_id_s_can_not_contain, __pyx_v_id}; - __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_7, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 278, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_7, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 277, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_GOTREF(__pyx_t_5); } else #endif { - __pyx_t_8 = PyTuple_New(2+__pyx_t_6); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 278, __pyx_L1_error) + __pyx_t_8 = PyTuple_New(2+__pyx_t_6); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 277, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); if (__pyx_t_2) { __Pyx_GIVEREF(__pyx_t_2); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_2); __pyx_t_2 = NULL; @@ -9736,14 +9742,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P __Pyx_INCREF(__pyx_v_id); __Pyx_GIVEREF(__pyx_v_id); PyTuple_SET_ITEM(__pyx_t_8, 1+__pyx_t_6, __pyx_v_id); - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_8, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 278, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_8, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 277, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; } __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":277 + /* "kivyblocks/blocks.pyx":276 * setattr(app.root, id, widget) * * if '.' in id: # <<<<<<<<<<<<<< @@ -9753,7 +9759,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P goto __pyx_L15; } - /* "kivyblocks/blocks.pyx":280 + /* "kivyblocks/blocks.pyx":279 * Logger.info('widget id(%s) can not contain "."', id) * else: * widget.widget_id = id # <<<<<<<<<<<<<< @@ -9761,11 +9767,11 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P * widget.build_desc = desc */ /*else*/ { - if (__Pyx_PyObject_SetAttrStr(__pyx_v_widget, __pyx_n_s_widget_id, __pyx_v_id) < 0) __PYX_ERR(0, 280, __pyx_L1_error) + if (__Pyx_PyObject_SetAttrStr(__pyx_v_widget, __pyx_n_s_widget_id, __pyx_v_id) < 0) __PYX_ERR(0, 279, __pyx_L1_error) } __pyx_L15:; - /* "kivyblocks/blocks.pyx":266 + /* "kivyblocks/blocks.pyx":265 * raise NotExistsObject(widgetClass) * * if desc.get('id'): # <<<<<<<<<<<<<< @@ -9774,23 +9780,23 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P */ } - /* "kivyblocks/blocks.pyx":282 + /* "kivyblocks/blocks.pyx":281 * widget.widget_id = id * * widget.build_desc = desc # <<<<<<<<<<<<<< * self.build_attributes(widget,desc) * self.build_rest(widget,desc) */ - if (__Pyx_PyObject_SetAttrStr(__pyx_v_widget, __pyx_n_s_build_desc, __pyx_v_desc) < 0) __PYX_ERR(0, 282, __pyx_L1_error) + if (__Pyx_PyObject_SetAttrStr(__pyx_v_widget, __pyx_n_s_build_desc, __pyx_v_desc) < 0) __PYX_ERR(0, 281, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":283 + /* "kivyblocks/blocks.pyx":282 * * widget.build_desc = desc * self.build_attributes(widget,desc) # <<<<<<<<<<<<<< * self.build_rest(widget,desc) * return widget */ - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_build_attributes); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 283, __pyx_L1_error) + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_build_attributes); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 282, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __pyx_t_8 = NULL; __pyx_t_6 = 0; @@ -9807,7 +9813,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_7)) { PyObject *__pyx_temp[3] = {__pyx_t_8, __pyx_v_widget, __pyx_v_desc}; - __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_7, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 283, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_7, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 282, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_GOTREF(__pyx_t_5); } else @@ -9815,13 +9821,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_7)) { PyObject *__pyx_temp[3] = {__pyx_t_8, __pyx_v_widget, __pyx_v_desc}; - __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_7, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 283, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_7, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 282, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_GOTREF(__pyx_t_5); } else #endif { - __pyx_t_2 = PyTuple_New(2+__pyx_t_6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 283, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(2+__pyx_t_6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 282, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); if (__pyx_t_8) { __Pyx_GIVEREF(__pyx_t_8); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_8); __pyx_t_8 = NULL; @@ -9832,21 +9838,21 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P __Pyx_INCREF(__pyx_v_desc); __Pyx_GIVEREF(__pyx_v_desc); PyTuple_SET_ITEM(__pyx_t_2, 1+__pyx_t_6, __pyx_v_desc); - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_2, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 283, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_2, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 282, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":284 + /* "kivyblocks/blocks.pyx":283 * widget.build_desc = desc * self.build_attributes(widget,desc) * self.build_rest(widget,desc) # <<<<<<<<<<<<<< * return widget * */ - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_build_rest); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 284, __pyx_L1_error) + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_build_rest); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 283, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __pyx_t_2 = NULL; __pyx_t_6 = 0; @@ -9863,7 +9869,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_7)) { PyObject *__pyx_temp[3] = {__pyx_t_2, __pyx_v_widget, __pyx_v_desc}; - __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_7, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 284, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_7, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 283, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_GOTREF(__pyx_t_5); } else @@ -9871,13 +9877,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_7)) { PyObject *__pyx_temp[3] = {__pyx_t_2, __pyx_v_widget, __pyx_v_desc}; - __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_7, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 284, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_7, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 283, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_GOTREF(__pyx_t_5); } else #endif { - __pyx_t_8 = PyTuple_New(2+__pyx_t_6); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 284, __pyx_L1_error) + __pyx_t_8 = PyTuple_New(2+__pyx_t_6); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 283, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); if (__pyx_t_2) { __Pyx_GIVEREF(__pyx_t_2); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_2); __pyx_t_2 = NULL; @@ -9888,14 +9894,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P __Pyx_INCREF(__pyx_v_desc); __Pyx_GIVEREF(__pyx_v_desc); PyTuple_SET_ITEM(__pyx_t_8, 1+__pyx_t_6, __pyx_v_desc); - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_8, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 284, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_8, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 283, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; } __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":285 + /* "kivyblocks/blocks.pyx":284 * self.build_attributes(widget,desc) * self.build_rest(widget,desc) * return widget # <<<<<<<<<<<<<< @@ -9907,7 +9913,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P __pyx_r = __pyx_v_widget; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":248 + /* "kivyblocks/blocks.pyx":247 * return obj * * def w_build(self,desc) -> Widget: # <<<<<<<<<<<<<< @@ -9940,7 +9946,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_20w_build(CYTHON_UNUSED P return __pyx_r; } -/* "kivyblocks/blocks.pyx":287 +/* "kivyblocks/blocks.pyx":286 * return widget * * def build_attributes(self, widget:Widget,desc,t=None): # <<<<<<<<<<<<<< @@ -9990,13 +9996,13 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_23build_attributes(PyObje case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_widget)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("build_attributes", 0, 3, 4, 1); __PYX_ERR(0, 287, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("build_attributes", 0, 3, 4, 1); __PYX_ERR(0, 286, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: if (likely((values[2] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_desc)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("build_attributes", 0, 3, 4, 2); __PYX_ERR(0, 287, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("build_attributes", 0, 3, 4, 2); __PYX_ERR(0, 286, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 3: @@ -10006,7 +10012,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_23build_attributes(PyObje } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "build_attributes") < 0)) __PYX_ERR(0, 287, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "build_attributes") < 0)) __PYX_ERR(0, 286, __pyx_L3_error) } } else { switch (PyTuple_GET_SIZE(__pyx_args)) { @@ -10026,7 +10032,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_23build_attributes(PyObje } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("build_attributes", 0, 3, 4, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 287, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("build_attributes", 0, 3, 4, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 286, __pyx_L3_error) __pyx_L3_error:; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.build_attributes", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); @@ -10066,14 +10072,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON int __pyx_clineno = 0; __Pyx_RefNannySetupContext("build_attributes", 0); - /* "kivyblocks/blocks.pyx":288 + /* "kivyblocks/blocks.pyx":287 * * def build_attributes(self, widget:Widget,desc,t=None): * excludes = ['widgettype','options','subwidgets','binds'] # <<<<<<<<<<<<<< * for k,v in [(k,v) for k,v in desc.items() if k not in excludes]: * if isinstance(v,dict) and v.get('widgettype'): */ - __pyx_t_1 = PyList_New(4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 288, __pyx_L1_error) + __pyx_t_1 = PyList_New(4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 287, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_n_s_widgettype); __Pyx_GIVEREF(__pyx_n_s_widgettype); @@ -10090,16 +10096,16 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON __pyx_v_excludes = ((PyObject*)__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":289 + /* "kivyblocks/blocks.pyx":288 * def build_attributes(self, widget:Widget,desc,t=None): * excludes = ['widgettype','options','subwidgets','binds'] * for k,v in [(k,v) for k,v in desc.items() if k not in excludes]: # <<<<<<<<<<<<<< * if isinstance(v,dict) and v.get('widgettype'): * b = Blocks() */ - __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 289, __pyx_L1_error) + __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 288, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_items); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 289, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_items); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 288, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_4 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_3))) { @@ -10113,16 +10119,16 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON } __pyx_t_2 = (__pyx_t_4) ? __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_4) : __Pyx_PyObject_CallNoArg(__pyx_t_3); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 289, __pyx_L1_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 288, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; if (likely(PyList_CheckExact(__pyx_t_2)) || PyTuple_CheckExact(__pyx_t_2)) { __pyx_t_3 = __pyx_t_2; __Pyx_INCREF(__pyx_t_3); __pyx_t_5 = 0; __pyx_t_6 = NULL; } else { - __pyx_t_5 = -1; __pyx_t_3 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 289, __pyx_L1_error) + __pyx_t_5 = -1; __pyx_t_3 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 288, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_6 = Py_TYPE(__pyx_t_3)->tp_iternext; if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 289, __pyx_L1_error) + __pyx_t_6 = Py_TYPE(__pyx_t_3)->tp_iternext; if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 288, __pyx_L1_error) } __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; for (;;) { @@ -10130,17 +10136,17 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON if (likely(PyList_CheckExact(__pyx_t_3))) { if (__pyx_t_5 >= PyList_GET_SIZE(__pyx_t_3)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_2 = PyList_GET_ITEM(__pyx_t_3, __pyx_t_5); __Pyx_INCREF(__pyx_t_2); __pyx_t_5++; if (unlikely(0 < 0)) __PYX_ERR(0, 289, __pyx_L1_error) + __pyx_t_2 = PyList_GET_ITEM(__pyx_t_3, __pyx_t_5); __Pyx_INCREF(__pyx_t_2); __pyx_t_5++; if (unlikely(0 < 0)) __PYX_ERR(0, 288, __pyx_L1_error) #else - __pyx_t_2 = PySequence_ITEM(__pyx_t_3, __pyx_t_5); __pyx_t_5++; if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 289, __pyx_L1_error) + __pyx_t_2 = PySequence_ITEM(__pyx_t_3, __pyx_t_5); __pyx_t_5++; if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 288, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); #endif } else { if (__pyx_t_5 >= PyTuple_GET_SIZE(__pyx_t_3)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_3, __pyx_t_5); __Pyx_INCREF(__pyx_t_2); __pyx_t_5++; if (unlikely(0 < 0)) __PYX_ERR(0, 289, __pyx_L1_error) + __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_3, __pyx_t_5); __Pyx_INCREF(__pyx_t_2); __pyx_t_5++; if (unlikely(0 < 0)) __PYX_ERR(0, 288, __pyx_L1_error) #else - __pyx_t_2 = PySequence_ITEM(__pyx_t_3, __pyx_t_5); __pyx_t_5++; if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 289, __pyx_L1_error) + __pyx_t_2 = PySequence_ITEM(__pyx_t_3, __pyx_t_5); __pyx_t_5++; if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 288, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); #endif } @@ -10150,7 +10156,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON PyObject* exc_type = PyErr_Occurred(); if (exc_type) { if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); - else __PYX_ERR(0, 289, __pyx_L1_error) + else __PYX_ERR(0, 288, __pyx_L1_error) } break; } @@ -10162,7 +10168,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON if (unlikely(size != 2)) { if (size > 2) __Pyx_RaiseTooManyValuesError(2); else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size); - __PYX_ERR(0, 289, __pyx_L1_error) + __PYX_ERR(0, 288, __pyx_L1_error) } #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS if (likely(PyTuple_CheckExact(sequence))) { @@ -10175,15 +10181,15 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON __Pyx_INCREF(__pyx_t_4); __Pyx_INCREF(__pyx_t_7); #else - __pyx_t_4 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 289, __pyx_L1_error) + __pyx_t_4 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 288, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_7 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 289, __pyx_L1_error) + __pyx_t_7 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 288, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); #endif __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } else { Py_ssize_t index = -1; - __pyx_t_8 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 289, __pyx_L1_error) + __pyx_t_8 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 288, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_t_9 = Py_TYPE(__pyx_t_8)->tp_iternext; @@ -10191,7 +10197,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON __Pyx_GOTREF(__pyx_t_4); index = 1; __pyx_t_7 = __pyx_t_9(__pyx_t_8); if (unlikely(!__pyx_t_7)) goto __pyx_L7_unpacking_failed; __Pyx_GOTREF(__pyx_t_7); - if (__Pyx_IternextUnpackEndCheck(__pyx_t_9(__pyx_t_8), 2) < 0) __PYX_ERR(0, 289, __pyx_L1_error) + if (__Pyx_IternextUnpackEndCheck(__pyx_t_9(__pyx_t_8), 2) < 0) __PYX_ERR(0, 288, __pyx_L1_error) __pyx_t_9 = NULL; __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; goto __pyx_L8_unpacking_done; @@ -10199,17 +10205,17 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __pyx_t_9 = NULL; if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index); - __PYX_ERR(0, 289, __pyx_L1_error) + __PYX_ERR(0, 288, __pyx_L1_error) __pyx_L8_unpacking_done:; } __Pyx_XDECREF_SET(__pyx_v_k, __pyx_t_4); __pyx_t_4 = 0; __Pyx_XDECREF_SET(__pyx_v_v, __pyx_t_7); __pyx_t_7 = 0; - __pyx_t_10 = (__Pyx_PySequence_ContainsTF(__pyx_v_k, __pyx_v_excludes, Py_NE)); if (unlikely(__pyx_t_10 < 0)) __PYX_ERR(0, 289, __pyx_L1_error) + __pyx_t_10 = (__Pyx_PySequence_ContainsTF(__pyx_v_k, __pyx_v_excludes, Py_NE)); if (unlikely(__pyx_t_10 < 0)) __PYX_ERR(0, 288, __pyx_L1_error) __pyx_t_11 = (__pyx_t_10 != 0); if (__pyx_t_11) { - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 289, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 288, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_v_k); __Pyx_GIVEREF(__pyx_v_k); @@ -10217,7 +10223,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON __Pyx_INCREF(__pyx_v_v); __Pyx_GIVEREF(__pyx_v_v); PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_v_v); - if (unlikely(__Pyx_ListComp_Append(__pyx_t_1, (PyObject*)__pyx_t_2))) __PYX_ERR(0, 289, __pyx_L1_error) + if (unlikely(__Pyx_ListComp_Append(__pyx_t_1, (PyObject*)__pyx_t_2))) __PYX_ERR(0, 288, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } } @@ -10227,9 +10233,9 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON for (;;) { if (__pyx_t_5 >= PyList_GET_SIZE(__pyx_t_3)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_1 = PyList_GET_ITEM(__pyx_t_3, __pyx_t_5); __Pyx_INCREF(__pyx_t_1); __pyx_t_5++; if (unlikely(0 < 0)) __PYX_ERR(0, 289, __pyx_L1_error) + __pyx_t_1 = PyList_GET_ITEM(__pyx_t_3, __pyx_t_5); __Pyx_INCREF(__pyx_t_1); __pyx_t_5++; if (unlikely(0 < 0)) __PYX_ERR(0, 288, __pyx_L1_error) #else - __pyx_t_1 = PySequence_ITEM(__pyx_t_3, __pyx_t_5); __pyx_t_5++; if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 289, __pyx_L1_error) + __pyx_t_1 = PySequence_ITEM(__pyx_t_3, __pyx_t_5); __pyx_t_5++; if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 288, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); #endif if ((likely(PyTuple_CheckExact(__pyx_t_1))) || (PyList_CheckExact(__pyx_t_1))) { @@ -10238,7 +10244,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON if (unlikely(size != 2)) { if (size > 2) __Pyx_RaiseTooManyValuesError(2); else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size); - __PYX_ERR(0, 289, __pyx_L1_error) + __PYX_ERR(0, 288, __pyx_L1_error) } #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS if (likely(PyTuple_CheckExact(sequence))) { @@ -10251,15 +10257,15 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON __Pyx_INCREF(__pyx_t_2); __Pyx_INCREF(__pyx_t_7); #else - __pyx_t_2 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 289, __pyx_L1_error) + __pyx_t_2 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 288, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_7 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 289, __pyx_L1_error) + __pyx_t_7 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 288, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); #endif __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; } else { Py_ssize_t index = -1; - __pyx_t_4 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 289, __pyx_L1_error) + __pyx_t_4 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 288, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_t_9 = Py_TYPE(__pyx_t_4)->tp_iternext; @@ -10267,7 +10273,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON __Pyx_GOTREF(__pyx_t_2); index = 1; __pyx_t_7 = __pyx_t_9(__pyx_t_4); if (unlikely(!__pyx_t_7)) goto __pyx_L10_unpacking_failed; __Pyx_GOTREF(__pyx_t_7); - if (__Pyx_IternextUnpackEndCheck(__pyx_t_9(__pyx_t_4), 2) < 0) __PYX_ERR(0, 289, __pyx_L1_error) + if (__Pyx_IternextUnpackEndCheck(__pyx_t_9(__pyx_t_4), 2) < 0) __PYX_ERR(0, 288, __pyx_L1_error) __pyx_t_9 = NULL; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; goto __pyx_L11_unpacking_done; @@ -10275,7 +10281,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __pyx_t_9 = NULL; if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index); - __PYX_ERR(0, 289, __pyx_L1_error) + __PYX_ERR(0, 288, __pyx_L1_error) __pyx_L11_unpacking_done:; } __Pyx_XDECREF_SET(__pyx_v_k, __pyx_t_2); @@ -10283,7 +10289,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON __Pyx_XDECREF_SET(__pyx_v_v, __pyx_t_7); __pyx_t_7 = 0; - /* "kivyblocks/blocks.pyx":290 + /* "kivyblocks/blocks.pyx":289 * excludes = ['widgettype','options','subwidgets','binds'] * for k,v in [(k,v) for k,v in desc.items() if k not in excludes]: * if isinstance(v,dict) and v.get('widgettype'): # <<<<<<<<<<<<<< @@ -10297,7 +10303,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON __pyx_t_11 = __pyx_t_12; goto __pyx_L13_bool_binop_done; } - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_v, __pyx_n_s_get); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 290, __pyx_L1_error) + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_v, __pyx_n_s_get); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 289, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __pyx_t_2 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_7))) { @@ -10311,23 +10317,23 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON } __pyx_t_1 = (__pyx_t_2) ? __Pyx_PyObject_Call2Args(__pyx_t_7, __pyx_t_2, __pyx_n_s_widgettype) : __Pyx_PyObject_CallOneArg(__pyx_t_7, __pyx_n_s_widgettype); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 290, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 289, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - __pyx_t_12 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_12 < 0)) __PYX_ERR(0, 290, __pyx_L1_error) + __pyx_t_12 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_12 < 0)) __PYX_ERR(0, 289, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_t_11 = __pyx_t_12; __pyx_L13_bool_binop_done:; if (__pyx_t_11) { - /* "kivyblocks/blocks.pyx":291 + /* "kivyblocks/blocks.pyx":290 * for k,v in [(k,v) for k,v in desc.items() if k not in excludes]: * if isinstance(v,dict) and v.get('widgettype'): * b = Blocks() # <<<<<<<<<<<<<< * v = self.valueExpr(v, localnamespace={'self':widget}) * w = b.w_build(v) */ - __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_n_s_Blocks); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 291, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_n_s_Blocks); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 290, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __pyx_t_2 = NULL; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_7))) { @@ -10341,34 +10347,34 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON } __pyx_t_1 = (__pyx_t_2) ? __Pyx_PyObject_CallOneArg(__pyx_t_7, __pyx_t_2) : __Pyx_PyObject_CallNoArg(__pyx_t_7); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 291, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 290, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_XDECREF_SET(__pyx_v_b, __pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":292 + /* "kivyblocks/blocks.pyx":291 * if isinstance(v,dict) and v.get('widgettype'): * b = Blocks() * v = self.valueExpr(v, localnamespace={'self':widget}) # <<<<<<<<<<<<<< * w = b.w_build(v) * if hasattr(widget,k): */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_valueExpr); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 292, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_valueExpr); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 291, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 292, __pyx_L1_error) + __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 291, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __Pyx_INCREF(__pyx_v_v); __Pyx_GIVEREF(__pyx_v_v); PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_v_v); - __pyx_t_2 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 292, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 291, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 292, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 291, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_self, __pyx_v_widget) < 0) __PYX_ERR(0, 292, __pyx_L1_error) - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_localnamespace, __pyx_t_4) < 0) __PYX_ERR(0, 292, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_self, __pyx_v_widget) < 0) __PYX_ERR(0, 291, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_localnamespace, __pyx_t_4) < 0) __PYX_ERR(0, 291, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_7, __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 292, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_7, __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 291, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -10376,14 +10382,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON __Pyx_DECREF_SET(__pyx_v_v, __pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":293 + /* "kivyblocks/blocks.pyx":292 * b = Blocks() * v = self.valueExpr(v, localnamespace={'self':widget}) * w = b.w_build(v) # <<<<<<<<<<<<<< * if hasattr(widget,k): * aw = getattr(widget,k) */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_b, __pyx_n_s_w_build); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 293, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_b, __pyx_n_s_w_build); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 292, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_7 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { @@ -10397,57 +10403,57 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON } __pyx_t_4 = (__pyx_t_7) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_7, __pyx_v_v) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_v_v); __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; - if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 293, __pyx_L1_error) + if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 292, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_XDECREF_SET(__pyx_v_w, __pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":294 + /* "kivyblocks/blocks.pyx":293 * v = self.valueExpr(v, localnamespace={'self':widget}) * w = b.w_build(v) * if hasattr(widget,k): # <<<<<<<<<<<<<< * aw = getattr(widget,k) * if isinstance(aw,Layout): */ - __pyx_t_11 = __Pyx_HasAttr(__pyx_v_widget, __pyx_v_k); if (unlikely(__pyx_t_11 == ((int)-1))) __PYX_ERR(0, 294, __pyx_L1_error) + __pyx_t_11 = __Pyx_HasAttr(__pyx_v_widget, __pyx_v_k); if (unlikely(__pyx_t_11 == ((int)-1))) __PYX_ERR(0, 293, __pyx_L1_error) __pyx_t_12 = (__pyx_t_11 != 0); if (__pyx_t_12) { - /* "kivyblocks/blocks.pyx":295 + /* "kivyblocks/blocks.pyx":294 * w = b.w_build(v) * if hasattr(widget,k): * aw = getattr(widget,k) # <<<<<<<<<<<<<< * if isinstance(aw,Layout): * aw.add_widget(w) */ - __pyx_t_4 = __Pyx_GetAttr(__pyx_v_widget, __pyx_v_k); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 295, __pyx_L1_error) + __pyx_t_4 = __Pyx_GetAttr(__pyx_v_widget, __pyx_v_k); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 294, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_XDECREF_SET(__pyx_v_aw, __pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":296 + /* "kivyblocks/blocks.pyx":295 * if hasattr(widget,k): * aw = getattr(widget,k) * if isinstance(aw,Layout): # <<<<<<<<<<<<<< * aw.add_widget(w) * continue */ - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_Layout); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 296, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_Layout); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 295, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_12 = PyObject_IsInstance(__pyx_v_aw, __pyx_t_4); if (unlikely(__pyx_t_12 == ((int)-1))) __PYX_ERR(0, 296, __pyx_L1_error) + __pyx_t_12 = PyObject_IsInstance(__pyx_v_aw, __pyx_t_4); if (unlikely(__pyx_t_12 == ((int)-1))) __PYX_ERR(0, 295, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __pyx_t_11 = (__pyx_t_12 != 0); if (__pyx_t_11) { - /* "kivyblocks/blocks.pyx":297 + /* "kivyblocks/blocks.pyx":296 * aw = getattr(widget,k) * if isinstance(aw,Layout): * aw.add_widget(w) # <<<<<<<<<<<<<< * continue * setattr(widget,k,w) */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_aw, __pyx_n_s_add_widget); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 297, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_aw, __pyx_n_s_add_widget); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 296, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_7 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { @@ -10461,12 +10467,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON } __pyx_t_4 = (__pyx_t_7) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_7, __pyx_v_w) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_v_w); __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; - if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 297, __pyx_L1_error) + if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 296, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":298 + /* "kivyblocks/blocks.pyx":297 * if isinstance(aw,Layout): * aw.add_widget(w) * continue # <<<<<<<<<<<<<< @@ -10475,7 +10481,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON */ goto __pyx_L3_continue; - /* "kivyblocks/blocks.pyx":296 + /* "kivyblocks/blocks.pyx":295 * if hasattr(widget,k): * aw = getattr(widget,k) * if isinstance(aw,Layout): # <<<<<<<<<<<<<< @@ -10484,7 +10490,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON */ } - /* "kivyblocks/blocks.pyx":294 + /* "kivyblocks/blocks.pyx":293 * v = self.valueExpr(v, localnamespace={'self':widget}) * w = b.w_build(v) * if hasattr(widget,k): # <<<<<<<<<<<<<< @@ -10493,16 +10499,16 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON */ } - /* "kivyblocks/blocks.pyx":299 + /* "kivyblocks/blocks.pyx":298 * aw.add_widget(w) * continue * setattr(widget,k,w) # <<<<<<<<<<<<<< * continue * setattr(widget,k,self.valueExpr(v,\ */ - __pyx_t_13 = PyObject_SetAttr(__pyx_v_widget, __pyx_v_k, __pyx_v_w); if (unlikely(__pyx_t_13 == ((int)-1))) __PYX_ERR(0, 299, __pyx_L1_error) + __pyx_t_13 = PyObject_SetAttr(__pyx_v_widget, __pyx_v_k, __pyx_v_w); if (unlikely(__pyx_t_13 == ((int)-1))) __PYX_ERR(0, 298, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":300 + /* "kivyblocks/blocks.pyx":299 * continue * setattr(widget,k,w) * continue # <<<<<<<<<<<<<< @@ -10511,7 +10517,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON */ goto __pyx_L3_continue; - /* "kivyblocks/blocks.pyx":290 + /* "kivyblocks/blocks.pyx":289 * excludes = ['widgettype','options','subwidgets','binds'] * for k,v in [(k,v) for k,v in desc.items() if k not in excludes]: * if isinstance(v,dict) and v.get('widgettype'): # <<<<<<<<<<<<<< @@ -10520,52 +10526,52 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON */ } - /* "kivyblocks/blocks.pyx":301 + /* "kivyblocks/blocks.pyx":300 * setattr(widget,k,w) * continue * setattr(widget,k,self.valueExpr(v,\ # <<<<<<<<<<<<<< * localnamespace={'self':widget})) * */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_valueExpr); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 301, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_valueExpr); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 300, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 301, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 300, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_v_v); __Pyx_GIVEREF(__pyx_v_v); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_v); - /* "kivyblocks/blocks.pyx":302 + /* "kivyblocks/blocks.pyx":301 * continue * setattr(widget,k,self.valueExpr(v,\ * localnamespace={'self':widget})) # <<<<<<<<<<<<<< * * def build_rest(self, widget:Widget,desc,t=None): */ - __pyx_t_7 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 302, __pyx_L1_error) + __pyx_t_7 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 301, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); - __pyx_t_1 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 302, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 301, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_self, __pyx_v_widget) < 0) __PYX_ERR(0, 302, __pyx_L1_error) - if (PyDict_SetItem(__pyx_t_7, __pyx_n_s_localnamespace, __pyx_t_1) < 0) __PYX_ERR(0, 302, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_self, __pyx_v_widget) < 0) __PYX_ERR(0, 301, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_7, __pyx_n_s_localnamespace, __pyx_t_1) < 0) __PYX_ERR(0, 301, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":301 + /* "kivyblocks/blocks.pyx":300 * setattr(widget,k,w) * continue * setattr(widget,k,self.valueExpr(v,\ # <<<<<<<<<<<<<< * localnamespace={'self':widget})) * */ - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_2, __pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 301, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_2, __pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 300, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - __pyx_t_13 = PyObject_SetAttr(__pyx_v_widget, __pyx_v_k, __pyx_t_1); if (unlikely(__pyx_t_13 == ((int)-1))) __PYX_ERR(0, 301, __pyx_L1_error) + __pyx_t_13 = PyObject_SetAttr(__pyx_v_widget, __pyx_v_k, __pyx_t_1); if (unlikely(__pyx_t_13 == ((int)-1))) __PYX_ERR(0, 300, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":289 + /* "kivyblocks/blocks.pyx":288 * def build_attributes(self, widget:Widget,desc,t=None): * excludes = ['widgettype','options','subwidgets','binds'] * for k,v in [(k,v) for k,v in desc.items() if k not in excludes]: # <<<<<<<<<<<<<< @@ -10576,7 +10582,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON } __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":287 + /* "kivyblocks/blocks.pyx":286 * return widget * * def build_attributes(self, widget:Widget,desc,t=None): # <<<<<<<<<<<<<< @@ -10608,7 +10614,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_22build_attributes(CYTHON return __pyx_r; } -/* "kivyblocks/blocks.pyx":304 +/* "kivyblocks/blocks.pyx":303 * localnamespace={'self':widget})) * * def build_rest(self, widget:Widget,desc,t=None): # <<<<<<<<<<<<<< @@ -10658,13 +10664,13 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_25build_rest(PyObject *__ case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_widget)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("build_rest", 0, 3, 4, 1); __PYX_ERR(0, 304, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("build_rest", 0, 3, 4, 1); __PYX_ERR(0, 303, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: if (likely((values[2] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_desc)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("build_rest", 0, 3, 4, 2); __PYX_ERR(0, 304, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("build_rest", 0, 3, 4, 2); __PYX_ERR(0, 303, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 3: @@ -10674,7 +10680,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_25build_rest(PyObject *__ } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "build_rest") < 0)) __PYX_ERR(0, 304, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "build_rest") < 0)) __PYX_ERR(0, 303, __pyx_L3_error) } } else { switch (PyTuple_GET_SIZE(__pyx_args)) { @@ -10694,7 +10700,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_25build_rest(PyObject *__ } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("build_rest", 0, 3, 4, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 304, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("build_rest", 0, 3, 4, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 303, __pyx_L3_error) __pyx_L3_error:; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.build_rest", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); @@ -10730,16 +10736,16 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE int __pyx_clineno = 0; __Pyx_RefNannySetupContext("build_rest", 0); - /* "kivyblocks/blocks.pyx":305 + /* "kivyblocks/blocks.pyx":304 * * def build_rest(self, widget:Widget,desc,t=None): * self.subwidget_total = len(desc.get('subwidgets',[])) # <<<<<<<<<<<<<< * self.subwidgets = [ None for i in range(self.subwidget_total)] * cdef int pos = 0 */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 305, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 304, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = PyList_New(0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 305, __pyx_L1_error) + __pyx_t_3 = PyList_New(0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 304, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_4 = NULL; __pyx_t_5 = 0; @@ -10756,7 +10762,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_2)) { PyObject *__pyx_temp[3] = {__pyx_t_4, __pyx_n_s_subwidgets, __pyx_t_3}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 305, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 304, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -10765,14 +10771,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_2)) { PyObject *__pyx_temp[3] = {__pyx_t_4, __pyx_n_s_subwidgets, __pyx_t_3}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 305, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 304, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } else #endif { - __pyx_t_6 = PyTuple_New(2+__pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 305, __pyx_L1_error) + __pyx_t_6 = PyTuple_New(2+__pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 304, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); if (__pyx_t_4) { __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_4); __pyx_t_4 = NULL; @@ -10783,39 +10789,39 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_6, 1+__pyx_t_5, __pyx_t_3); __pyx_t_3 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_6, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 305, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_6, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 304, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; } __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_7 = PyObject_Length(__pyx_t_1); if (unlikely(__pyx_t_7 == ((Py_ssize_t)-1))) __PYX_ERR(0, 305, __pyx_L1_error) + __pyx_t_7 = PyObject_Length(__pyx_t_1); if (unlikely(__pyx_t_7 == ((Py_ssize_t)-1))) __PYX_ERR(0, 304, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = PyInt_FromSsize_t(__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 305, __pyx_L1_error) + __pyx_t_1 = PyInt_FromSsize_t(__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 304, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (__Pyx_PyObject_SetAttrStr(__pyx_v_self, __pyx_n_s_subwidget_total, __pyx_t_1) < 0) __PYX_ERR(0, 305, __pyx_L1_error) + if (__Pyx_PyObject_SetAttrStr(__pyx_v_self, __pyx_n_s_subwidget_total, __pyx_t_1) < 0) __PYX_ERR(0, 304, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":306 + /* "kivyblocks/blocks.pyx":305 * def build_rest(self, widget:Widget,desc,t=None): * self.subwidget_total = len(desc.get('subwidgets',[])) * self.subwidgets = [ None for i in range(self.subwidget_total)] # <<<<<<<<<<<<<< * cdef int pos = 0 * for pos,sw in enumerate(desc.get('subwidgets',[])): */ - __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 306, __pyx_L1_error) + __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 305, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_subwidget_total); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 306, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_subwidget_total); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 305, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_6 = __Pyx_PyObject_CallOneArg(__pyx_builtin_range, __pyx_t_2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 306, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_CallOneArg(__pyx_builtin_range, __pyx_t_2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 305, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; if (likely(PyList_CheckExact(__pyx_t_6)) || PyTuple_CheckExact(__pyx_t_6)) { __pyx_t_2 = __pyx_t_6; __Pyx_INCREF(__pyx_t_2); __pyx_t_7 = 0; __pyx_t_8 = NULL; } else { - __pyx_t_7 = -1; __pyx_t_2 = PyObject_GetIter(__pyx_t_6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 306, __pyx_L1_error) + __pyx_t_7 = -1; __pyx_t_2 = PyObject_GetIter(__pyx_t_6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 305, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_8 = Py_TYPE(__pyx_t_2)->tp_iternext; if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 306, __pyx_L1_error) + __pyx_t_8 = Py_TYPE(__pyx_t_2)->tp_iternext; if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 305, __pyx_L1_error) } __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; for (;;) { @@ -10823,17 +10829,17 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE if (likely(PyList_CheckExact(__pyx_t_2))) { if (__pyx_t_7 >= PyList_GET_SIZE(__pyx_t_2)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_6 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_7); __Pyx_INCREF(__pyx_t_6); __pyx_t_7++; if (unlikely(0 < 0)) __PYX_ERR(0, 306, __pyx_L1_error) + __pyx_t_6 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_7); __Pyx_INCREF(__pyx_t_6); __pyx_t_7++; if (unlikely(0 < 0)) __PYX_ERR(0, 305, __pyx_L1_error) #else - __pyx_t_6 = PySequence_ITEM(__pyx_t_2, __pyx_t_7); __pyx_t_7++; if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 306, __pyx_L1_error) + __pyx_t_6 = PySequence_ITEM(__pyx_t_2, __pyx_t_7); __pyx_t_7++; if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 305, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); #endif } else { if (__pyx_t_7 >= PyTuple_GET_SIZE(__pyx_t_2)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_6 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_7); __Pyx_INCREF(__pyx_t_6); __pyx_t_7++; if (unlikely(0 < 0)) __PYX_ERR(0, 306, __pyx_L1_error) + __pyx_t_6 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_7); __Pyx_INCREF(__pyx_t_6); __pyx_t_7++; if (unlikely(0 < 0)) __PYX_ERR(0, 305, __pyx_L1_error) #else - __pyx_t_6 = PySequence_ITEM(__pyx_t_2, __pyx_t_7); __pyx_t_7++; if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 306, __pyx_L1_error) + __pyx_t_6 = PySequence_ITEM(__pyx_t_2, __pyx_t_7); __pyx_t_7++; if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 305, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); #endif } @@ -10843,7 +10849,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE PyObject* exc_type = PyErr_Occurred(); if (exc_type) { if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); - else __PYX_ERR(0, 306, __pyx_L1_error) + else __PYX_ERR(0, 305, __pyx_L1_error) } break; } @@ -10851,13 +10857,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE } __Pyx_XDECREF_SET(__pyx_v_i, __pyx_t_6); __pyx_t_6 = 0; - if (unlikely(__Pyx_ListComp_Append(__pyx_t_1, (PyObject*)Py_None))) __PYX_ERR(0, 306, __pyx_L1_error) + if (unlikely(__Pyx_ListComp_Append(__pyx_t_1, (PyObject*)Py_None))) __PYX_ERR(0, 305, __pyx_L1_error) } __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - if (__Pyx_PyObject_SetAttrStr(__pyx_v_self, __pyx_n_s_subwidgets, __pyx_t_1) < 0) __PYX_ERR(0, 306, __pyx_L1_error) + if (__Pyx_PyObject_SetAttrStr(__pyx_v_self, __pyx_n_s_subwidgets, __pyx_t_1) < 0) __PYX_ERR(0, 305, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":307 + /* "kivyblocks/blocks.pyx":306 * self.subwidget_total = len(desc.get('subwidgets',[])) * self.subwidgets = [ None for i in range(self.subwidget_total)] * cdef int pos = 0 # <<<<<<<<<<<<<< @@ -10866,7 +10872,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE */ __pyx_v_pos = 0; - /* "kivyblocks/blocks.pyx":308 + /* "kivyblocks/blocks.pyx":307 * self.subwidgets = [ None for i in range(self.subwidget_total)] * cdef int pos = 0 * for pos,sw in enumerate(desc.get('subwidgets',[])): # <<<<<<<<<<<<<< @@ -10874,9 +10880,9 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE * kw = self.valueExpr(sw.copy(), */ __pyx_t_5 = 0; - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 308, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 307, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_6 = PyList_New(0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 308, __pyx_L1_error) + __pyx_t_6 = PyList_New(0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 307, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __pyx_t_3 = NULL; __pyx_t_9 = 0; @@ -10893,7 +10899,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_2)) { PyObject *__pyx_temp[3] = {__pyx_t_3, __pyx_n_s_subwidgets, __pyx_t_6}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_9, 2+__pyx_t_9); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 308, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_9, 2+__pyx_t_9); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 307, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; @@ -10902,14 +10908,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_2)) { PyObject *__pyx_temp[3] = {__pyx_t_3, __pyx_n_s_subwidgets, __pyx_t_6}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_9, 2+__pyx_t_9); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 308, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_9, 2+__pyx_t_9); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 307, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; } else #endif { - __pyx_t_4 = PyTuple_New(2+__pyx_t_9); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 308, __pyx_L1_error) + __pyx_t_4 = PyTuple_New(2+__pyx_t_9); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 307, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); if (__pyx_t_3) { __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); __pyx_t_3 = NULL; @@ -10920,7 +10926,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_4, 1+__pyx_t_9, __pyx_t_6); __pyx_t_6 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_4, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 308, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_4, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 307, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; } @@ -10929,9 +10935,9 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE __pyx_t_2 = __pyx_t_1; __Pyx_INCREF(__pyx_t_2); __pyx_t_7 = 0; __pyx_t_8 = NULL; } else { - __pyx_t_7 = -1; __pyx_t_2 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 308, __pyx_L1_error) + __pyx_t_7 = -1; __pyx_t_2 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 307, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_8 = Py_TYPE(__pyx_t_2)->tp_iternext; if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 308, __pyx_L1_error) + __pyx_t_8 = Py_TYPE(__pyx_t_2)->tp_iternext; if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 307, __pyx_L1_error) } __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; for (;;) { @@ -10939,17 +10945,17 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE if (likely(PyList_CheckExact(__pyx_t_2))) { if (__pyx_t_7 >= PyList_GET_SIZE(__pyx_t_2)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_1 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_7); __Pyx_INCREF(__pyx_t_1); __pyx_t_7++; if (unlikely(0 < 0)) __PYX_ERR(0, 308, __pyx_L1_error) + __pyx_t_1 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_7); __Pyx_INCREF(__pyx_t_1); __pyx_t_7++; if (unlikely(0 < 0)) __PYX_ERR(0, 307, __pyx_L1_error) #else - __pyx_t_1 = PySequence_ITEM(__pyx_t_2, __pyx_t_7); __pyx_t_7++; if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 308, __pyx_L1_error) + __pyx_t_1 = PySequence_ITEM(__pyx_t_2, __pyx_t_7); __pyx_t_7++; if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 307, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); #endif } else { if (__pyx_t_7 >= PyTuple_GET_SIZE(__pyx_t_2)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_1 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_7); __Pyx_INCREF(__pyx_t_1); __pyx_t_7++; if (unlikely(0 < 0)) __PYX_ERR(0, 308, __pyx_L1_error) + __pyx_t_1 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_7); __Pyx_INCREF(__pyx_t_1); __pyx_t_7++; if (unlikely(0 < 0)) __PYX_ERR(0, 307, __pyx_L1_error) #else - __pyx_t_1 = PySequence_ITEM(__pyx_t_2, __pyx_t_7); __pyx_t_7++; if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 308, __pyx_L1_error) + __pyx_t_1 = PySequence_ITEM(__pyx_t_2, __pyx_t_7); __pyx_t_7++; if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 307, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); #endif } @@ -10959,7 +10965,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE PyObject* exc_type = PyErr_Occurred(); if (exc_type) { if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); - else __PYX_ERR(0, 308, __pyx_L1_error) + else __PYX_ERR(0, 307, __pyx_L1_error) } break; } @@ -10970,14 +10976,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE __pyx_v_pos = __pyx_t_5; __pyx_t_5 = (__pyx_t_5 + 1); - /* "kivyblocks/blocks.pyx":309 + /* "kivyblocks/blocks.pyx":308 * cdef int pos = 0 * for pos,sw in enumerate(desc.get('subwidgets',[])): * b = Blocks() # <<<<<<<<<<<<<< * kw = self.valueExpr(sw.copy(), * localnamespace={'self':widget}) */ - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_Blocks); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 309, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_Blocks); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 308, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __pyx_t_6 = NULL; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_4))) { @@ -10991,22 +10997,22 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE } __pyx_t_1 = (__pyx_t_6) ? __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_6) : __Pyx_PyObject_CallNoArg(__pyx_t_4); __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 309, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 308, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_XDECREF_SET(__pyx_v_b, __pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":310 + /* "kivyblocks/blocks.pyx":309 * for pos,sw in enumerate(desc.get('subwidgets',[])): * b = Blocks() * kw = self.valueExpr(sw.copy(), # <<<<<<<<<<<<<< * localnamespace={'self':widget}) * w = b.widgetBuild(kw) */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_valueExpr); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 310, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_valueExpr); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 309, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_sw, __pyx_n_s_copy); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 310, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_sw, __pyx_n_s_copy); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 309, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __pyx_t_3 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_6))) { @@ -11020,38 +11026,38 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE } __pyx_t_4 = (__pyx_t_3) ? __Pyx_PyObject_CallOneArg(__pyx_t_6, __pyx_t_3) : __Pyx_PyObject_CallNoArg(__pyx_t_6); __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 310, __pyx_L1_error) + if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 309, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 310, __pyx_L1_error) + __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 309, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":311 + /* "kivyblocks/blocks.pyx":310 * b = Blocks() * kw = self.valueExpr(sw.copy(), * localnamespace={'self':widget}) # <<<<<<<<<<<<<< * w = b.widgetBuild(kw) * widget.add_widget(w) */ - __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 311, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 310, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 311, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 310, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_self, __pyx_v_widget) < 0) __PYX_ERR(0, 311, __pyx_L1_error) - if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_localnamespace, __pyx_t_3) < 0) __PYX_ERR(0, 311, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_self, __pyx_v_widget) < 0) __PYX_ERR(0, 310, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_localnamespace, __pyx_t_3) < 0) __PYX_ERR(0, 310, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":310 + /* "kivyblocks/blocks.pyx":309 * for pos,sw in enumerate(desc.get('subwidgets',[])): * b = Blocks() * kw = self.valueExpr(sw.copy(), # <<<<<<<<<<<<<< * localnamespace={'self':widget}) * w = b.widgetBuild(kw) */ - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_6, __pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 310, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_6, __pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 309, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; @@ -11059,14 +11065,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE __Pyx_XDECREF_SET(__pyx_v_kw, __pyx_t_3); __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":312 + /* "kivyblocks/blocks.pyx":311 * kw = self.valueExpr(sw.copy(), * localnamespace={'self':widget}) * w = b.widgetBuild(kw) # <<<<<<<<<<<<<< * widget.add_widget(w) * */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_b, __pyx_n_s_widgetBuild); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 312, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_b, __pyx_n_s_widgetBuild); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 311, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __pyx_t_6 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_4))) { @@ -11080,20 +11086,20 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE } __pyx_t_3 = (__pyx_t_6) ? __Pyx_PyObject_Call2Args(__pyx_t_4, __pyx_t_6, __pyx_v_kw) : __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_v_kw); __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; - if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 312, __pyx_L1_error) + if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 311, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_XDECREF_SET(__pyx_v_w, __pyx_t_3); __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":313 + /* "kivyblocks/blocks.pyx":312 * localnamespace={'self':widget}) * w = b.widgetBuild(kw) * widget.add_widget(w) # <<<<<<<<<<<<<< * * for b in desc.get('binds',[]): */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_widget, __pyx_n_s_add_widget); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 313, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_widget, __pyx_n_s_add_widget); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 312, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __pyx_t_6 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_4))) { @@ -11107,12 +11113,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE } __pyx_t_3 = (__pyx_t_6) ? __Pyx_PyObject_Call2Args(__pyx_t_4, __pyx_t_6, __pyx_v_w) : __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_v_w); __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; - if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 313, __pyx_L1_error) + if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 312, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":308 + /* "kivyblocks/blocks.pyx":307 * self.subwidgets = [ None for i in range(self.subwidget_total)] * cdef int pos = 0 * for pos,sw in enumerate(desc.get('subwidgets',[])): # <<<<<<<<<<<<<< @@ -11122,16 +11128,16 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE } __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":315 + /* "kivyblocks/blocks.pyx":314 * widget.add_widget(w) * * for b in desc.get('binds',[]): # <<<<<<<<<<<<<< * kw = self.valueExpr(b.copy(), \ * localnamespace={'self':widget}) */ - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 315, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 314, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_4 = PyList_New(0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 315, __pyx_L1_error) + __pyx_t_4 = PyList_New(0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 314, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __pyx_t_6 = NULL; __pyx_t_5 = 0; @@ -11148,7 +11154,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_3)) { PyObject *__pyx_temp[3] = {__pyx_t_6, __pyx_n_s_binds, __pyx_t_4}; - __pyx_t_2 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 315, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 314, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; @@ -11157,14 +11163,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_3)) { PyObject *__pyx_temp[3] = {__pyx_t_6, __pyx_n_s_binds, __pyx_t_4}; - __pyx_t_2 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 315, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 314, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; } else #endif { - __pyx_t_1 = PyTuple_New(2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 315, __pyx_L1_error) + __pyx_t_1 = PyTuple_New(2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 314, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); if (__pyx_t_6) { __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_6); __pyx_t_6 = NULL; @@ -11175,7 +11181,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_1, 1+__pyx_t_5, __pyx_t_4); __pyx_t_4 = 0; - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 315, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 314, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; } @@ -11184,9 +11190,9 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE __pyx_t_3 = __pyx_t_2; __Pyx_INCREF(__pyx_t_3); __pyx_t_7 = 0; __pyx_t_8 = NULL; } else { - __pyx_t_7 = -1; __pyx_t_3 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 315, __pyx_L1_error) + __pyx_t_7 = -1; __pyx_t_3 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 314, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_8 = Py_TYPE(__pyx_t_3)->tp_iternext; if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 315, __pyx_L1_error) + __pyx_t_8 = Py_TYPE(__pyx_t_3)->tp_iternext; if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 314, __pyx_L1_error) } __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; for (;;) { @@ -11194,17 +11200,17 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE if (likely(PyList_CheckExact(__pyx_t_3))) { if (__pyx_t_7 >= PyList_GET_SIZE(__pyx_t_3)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_2 = PyList_GET_ITEM(__pyx_t_3, __pyx_t_7); __Pyx_INCREF(__pyx_t_2); __pyx_t_7++; if (unlikely(0 < 0)) __PYX_ERR(0, 315, __pyx_L1_error) + __pyx_t_2 = PyList_GET_ITEM(__pyx_t_3, __pyx_t_7); __Pyx_INCREF(__pyx_t_2); __pyx_t_7++; if (unlikely(0 < 0)) __PYX_ERR(0, 314, __pyx_L1_error) #else - __pyx_t_2 = PySequence_ITEM(__pyx_t_3, __pyx_t_7); __pyx_t_7++; if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 315, __pyx_L1_error) + __pyx_t_2 = PySequence_ITEM(__pyx_t_3, __pyx_t_7); __pyx_t_7++; if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 314, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); #endif } else { if (__pyx_t_7 >= PyTuple_GET_SIZE(__pyx_t_3)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_3, __pyx_t_7); __Pyx_INCREF(__pyx_t_2); __pyx_t_7++; if (unlikely(0 < 0)) __PYX_ERR(0, 315, __pyx_L1_error) + __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_3, __pyx_t_7); __Pyx_INCREF(__pyx_t_2); __pyx_t_7++; if (unlikely(0 < 0)) __PYX_ERR(0, 314, __pyx_L1_error) #else - __pyx_t_2 = PySequence_ITEM(__pyx_t_3, __pyx_t_7); __pyx_t_7++; if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 315, __pyx_L1_error) + __pyx_t_2 = PySequence_ITEM(__pyx_t_3, __pyx_t_7); __pyx_t_7++; if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 314, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); #endif } @@ -11214,7 +11220,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE PyObject* exc_type = PyErr_Occurred(); if (exc_type) { if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); - else __PYX_ERR(0, 315, __pyx_L1_error) + else __PYX_ERR(0, 314, __pyx_L1_error) } break; } @@ -11223,16 +11229,16 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE __Pyx_XDECREF_SET(__pyx_v_b, __pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":316 + /* "kivyblocks/blocks.pyx":315 * * for b in desc.get('binds',[]): * kw = self.valueExpr(b.copy(), \ # <<<<<<<<<<<<<< * localnamespace={'self':widget}) * self.buildBind(widget,kw) */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_valueExpr); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 316, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_valueExpr); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 315, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_b, __pyx_n_s_copy); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 316, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_b, __pyx_n_s_copy); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 315, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __pyx_t_6 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_4))) { @@ -11246,38 +11252,38 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE } __pyx_t_1 = (__pyx_t_6) ? __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_6) : __Pyx_PyObject_CallNoArg(__pyx_t_4); __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 316, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 315, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 316, __pyx_L1_error) + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 315, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_GIVEREF(__pyx_t_1); PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":317 + /* "kivyblocks/blocks.pyx":316 * for b in desc.get('binds',[]): * kw = self.valueExpr(b.copy(), \ * localnamespace={'self':widget}) # <<<<<<<<<<<<<< * self.buildBind(widget,kw) * */ - __pyx_t_1 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 317, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 316, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_6 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 317, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 316, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_self, __pyx_v_widget) < 0) __PYX_ERR(0, 317, __pyx_L1_error) - if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_localnamespace, __pyx_t_6) < 0) __PYX_ERR(0, 317, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_self, __pyx_v_widget) < 0) __PYX_ERR(0, 316, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_localnamespace, __pyx_t_6) < 0) __PYX_ERR(0, 316, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - /* "kivyblocks/blocks.pyx":316 + /* "kivyblocks/blocks.pyx":315 * * for b in desc.get('binds',[]): * kw = self.valueExpr(b.copy(), \ # <<<<<<<<<<<<<< * localnamespace={'self':widget}) * self.buildBind(widget,kw) */ - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_4, __pyx_t_1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 316, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_4, __pyx_t_1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 315, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; @@ -11285,14 +11291,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE __Pyx_XDECREF_SET(__pyx_v_kw, __pyx_t_6); __pyx_t_6 = 0; - /* "kivyblocks/blocks.pyx":318 + /* "kivyblocks/blocks.pyx":317 * kw = self.valueExpr(b.copy(), \ * localnamespace={'self':widget}) * self.buildBind(widget,kw) # <<<<<<<<<<<<<< * * def buildBind(self, widget:Widget, desc): */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_buildBind); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 318, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_buildBind); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 317, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_t_4 = NULL; __pyx_t_5 = 0; @@ -11309,7 +11315,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_1)) { PyObject *__pyx_temp[3] = {__pyx_t_4, __pyx_v_widget, __pyx_v_kw}; - __pyx_t_6 = __Pyx_PyFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 318, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 317, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_GOTREF(__pyx_t_6); } else @@ -11317,13 +11323,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_1)) { PyObject *__pyx_temp[3] = {__pyx_t_4, __pyx_v_widget, __pyx_v_kw}; - __pyx_t_6 = __Pyx_PyCFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 318, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyCFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 317, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_GOTREF(__pyx_t_6); } else #endif { - __pyx_t_2 = PyTuple_New(2+__pyx_t_5); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 318, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(2+__pyx_t_5); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 317, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); if (__pyx_t_4) { __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_4); __pyx_t_4 = NULL; @@ -11334,14 +11340,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE __Pyx_INCREF(__pyx_v_kw); __Pyx_GIVEREF(__pyx_v_kw); PyTuple_SET_ITEM(__pyx_t_2, 1+__pyx_t_5, __pyx_v_kw); - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 318, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 317, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - /* "kivyblocks/blocks.pyx":315 + /* "kivyblocks/blocks.pyx":314 * widget.add_widget(w) * * for b in desc.get('binds',[]): # <<<<<<<<<<<<<< @@ -11351,7 +11357,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE } __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":304 + /* "kivyblocks/blocks.pyx":303 * localnamespace={'self':widget})) * * def build_rest(self, widget:Widget,desc,t=None): # <<<<<<<<<<<<<< @@ -11381,7 +11387,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_24build_rest(CYTHON_UNUSE return __pyx_r; } -/* "kivyblocks/blocks.pyx":320 +/* "kivyblocks/blocks.pyx":319 * self.buildBind(widget,kw) * * def buildBind(self, widget:Widget, desc): # <<<<<<<<<<<<<< @@ -11427,17 +11433,17 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_27buildBind(PyObject *__p case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_widget)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("buildBind", 1, 3, 3, 1); __PYX_ERR(0, 320, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("buildBind", 1, 3, 3, 1); __PYX_ERR(0, 319, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: if (likely((values[2] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_desc)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("buildBind", 1, 3, 3, 2); __PYX_ERR(0, 320, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("buildBind", 1, 3, 3, 2); __PYX_ERR(0, 319, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "buildBind") < 0)) __PYX_ERR(0, 320, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "buildBind") < 0)) __PYX_ERR(0, 319, __pyx_L3_error) } } else if (PyTuple_GET_SIZE(__pyx_args) != 3) { goto __pyx_L5_argtuple_error; @@ -11452,7 +11458,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_27buildBind(PyObject *__p } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("buildBind", 1, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 320, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("buildBind", 1, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 319, __pyx_L3_error) __pyx_L3_error:; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.buildBind", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); @@ -11485,47 +11491,47 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_26buildBind(CYTHON_UNUSED int __pyx_clineno = 0; __Pyx_RefNannySetupContext("buildBind", 0); - /* "kivyblocks/blocks.pyx":321 + /* "kivyblocks/blocks.pyx":320 * * def buildBind(self, widget:Widget, desc): * wid = desc.get('wid','self') # <<<<<<<<<<<<<< * w = Blocks.getWidgetById(desc.get('wid','self'),from_widget=widget) * if not w: */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 321, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 320, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_tuple__9, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 321, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_tuple__9, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 320, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_wid = __pyx_t_2; __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":322 + /* "kivyblocks/blocks.pyx":321 * def buildBind(self, widget:Widget, desc): * wid = desc.get('wid','self') * w = Blocks.getWidgetById(desc.get('wid','self'),from_widget=widget) # <<<<<<<<<<<<<< * if not w: * Logger.info('Block: %s %s',desc.get('wid','self'), */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Blocks); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 322, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Blocks); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 321, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_getWidgetById); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 322, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_getWidgetById); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 321, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 322, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 321, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_tuple__9, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 322, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_tuple__9, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 321, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 322, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 321, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 322, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 321, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_from_widget, __pyx_v_widget) < 0) __PYX_ERR(0, 322, __pyx_L1_error) - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_2, __pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 322, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_from_widget, __pyx_v_widget) < 0) __PYX_ERR(0, 321, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_2, __pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 321, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; @@ -11533,32 +11539,32 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_26buildBind(CYTHON_UNUSED __pyx_v_w = __pyx_t_4; __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":323 + /* "kivyblocks/blocks.pyx":322 * wid = desc.get('wid','self') * w = Blocks.getWidgetById(desc.get('wid','self'),from_widget=widget) * if not w: # <<<<<<<<<<<<<< * Logger.info('Block: %s %s',desc.get('wid','self'), * 'not found via Blocks.getWidgetById()') */ - __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_v_w); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 323, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_v_w); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 322, __pyx_L1_error) __pyx_t_6 = ((!__pyx_t_5) != 0); if (__pyx_t_6) { - /* "kivyblocks/blocks.pyx":324 + /* "kivyblocks/blocks.pyx":323 * w = Blocks.getWidgetById(desc.get('wid','self'),from_widget=widget) * if not w: * Logger.info('Block: %s %s',desc.get('wid','self'), # <<<<<<<<<<<<<< * 'not found via Blocks.getWidgetById()') * return */ - __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_Logger); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 324, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_Logger); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 323, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_info); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 324, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_info); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 323, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 324, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 323, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_tuple__9, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 324, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_tuple__9, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 323, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_t_3 = NULL; @@ -11576,7 +11582,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_26buildBind(CYTHON_UNUSED #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_2)) { PyObject *__pyx_temp[4] = {__pyx_t_3, __pyx_kp_s_Block_s_s, __pyx_t_1, __pyx_kp_s_not_found_via_Blocks_getWidgetBy}; - __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_7, 3+__pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 324, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_7, 3+__pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 323, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; @@ -11585,14 +11591,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_26buildBind(CYTHON_UNUSED #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_2)) { PyObject *__pyx_temp[4] = {__pyx_t_3, __pyx_kp_s_Block_s_s, __pyx_t_1, __pyx_kp_s_not_found_via_Blocks_getWidgetBy}; - __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_7, 3+__pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 324, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_7, 3+__pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 323, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; } else #endif { - __pyx_t_8 = PyTuple_New(3+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 324, __pyx_L1_error) + __pyx_t_8 = PyTuple_New(3+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 323, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); if (__pyx_t_3) { __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_3); __pyx_t_3 = NULL; @@ -11606,14 +11612,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_26buildBind(CYTHON_UNUSED __Pyx_GIVEREF(__pyx_kp_s_not_found_via_Blocks_getWidgetBy); PyTuple_SET_ITEM(__pyx_t_8, 2+__pyx_t_7, __pyx_kp_s_not_found_via_Blocks_getWidgetBy); __pyx_t_1 = 0; - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_8, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 324, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_8, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 323, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; } __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":326 + /* "kivyblocks/blocks.pyx":325 * Logger.info('Block: %s %s',desc.get('wid','self'), * 'not found via Blocks.getWidgetById()') * return # <<<<<<<<<<<<<< @@ -11624,7 +11630,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_26buildBind(CYTHON_UNUSED __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "kivyblocks/blocks.pyx":323 + /* "kivyblocks/blocks.pyx":322 * wid = desc.get('wid','self') * w = Blocks.getWidgetById(desc.get('wid','self'),from_widget=widget) * if not w: # <<<<<<<<<<<<<< @@ -11633,14 +11639,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_26buildBind(CYTHON_UNUSED */ } - /* "kivyblocks/blocks.pyx":327 + /* "kivyblocks/blocks.pyx":326 * 'not found via Blocks.getWidgetById()') * return * event = desc.get('event') # <<<<<<<<<<<<<< * if event is None: * Logger.info('Block: binds desc miss event, desc=%s',str(desc)) */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 327, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 326, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_8 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { @@ -11654,13 +11660,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_26buildBind(CYTHON_UNUSED } __pyx_t_4 = (__pyx_t_8) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_8, __pyx_n_s_event) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_n_s_event); __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; - if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 327, __pyx_L1_error) + if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 326, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_v_event = __pyx_t_4; __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":328 + /* "kivyblocks/blocks.pyx":327 * return * event = desc.get('event') * if event is None: # <<<<<<<<<<<<<< @@ -11671,19 +11677,19 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_26buildBind(CYTHON_UNUSED __pyx_t_5 = (__pyx_t_6 != 0); if (__pyx_t_5) { - /* "kivyblocks/blocks.pyx":329 + /* "kivyblocks/blocks.pyx":328 * event = desc.get('event') * if event is None: * Logger.info('Block: binds desc miss event, desc=%s',str(desc)) # <<<<<<<<<<<<<< * return * f = self.buildAction(widget,desc) */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Logger); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 329, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Logger); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 328, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_info); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 329, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_info); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 328, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyString_Type)), __pyx_v_desc); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 329, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyString_Type)), __pyx_v_desc); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 328, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_1 = NULL; __pyx_t_7 = 0; @@ -11700,7 +11706,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_26buildBind(CYTHON_UNUSED #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_8)) { PyObject *__pyx_temp[3] = {__pyx_t_1, __pyx_kp_s_Block_binds_desc_miss_event_desc, __pyx_t_2}; - __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 329, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 328, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; @@ -11709,14 +11715,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_26buildBind(CYTHON_UNUSED #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_8)) { PyObject *__pyx_temp[3] = {__pyx_t_1, __pyx_kp_s_Block_binds_desc_miss_event_desc, __pyx_t_2}; - __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 329, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 328, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } else #endif { - __pyx_t_3 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 329, __pyx_L1_error) + __pyx_t_3 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 328, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); if (__pyx_t_1) { __Pyx_GIVEREF(__pyx_t_1); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1); __pyx_t_1 = NULL; @@ -11727,14 +11733,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_26buildBind(CYTHON_UNUSED __Pyx_GIVEREF(__pyx_t_2); PyTuple_SET_ITEM(__pyx_t_3, 1+__pyx_t_7, __pyx_t_2); __pyx_t_2 = 0; - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 329, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 328, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":330 + /* "kivyblocks/blocks.pyx":329 * if event is None: * Logger.info('Block: binds desc miss event, desc=%s',str(desc)) * return # <<<<<<<<<<<<<< @@ -11745,7 +11751,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_26buildBind(CYTHON_UNUSED __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "kivyblocks/blocks.pyx":328 + /* "kivyblocks/blocks.pyx":327 * return * event = desc.get('event') * if event is None: # <<<<<<<<<<<<<< @@ -11754,14 +11760,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_26buildBind(CYTHON_UNUSED */ } - /* "kivyblocks/blocks.pyx":331 + /* "kivyblocks/blocks.pyx":330 * Logger.info('Block: binds desc miss event, desc=%s',str(desc)) * return * f = self.buildAction(widget,desc) # <<<<<<<<<<<<<< * if f is None: * Logger.info('Block: get a null function,%s',str(desc)) */ - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_buildAction); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 331, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_buildAction); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 330, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __pyx_t_3 = NULL; __pyx_t_7 = 0; @@ -11778,7 +11784,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_26buildBind(CYTHON_UNUSED #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_8)) { PyObject *__pyx_temp[3] = {__pyx_t_3, __pyx_v_widget, __pyx_v_desc}; - __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 331, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 330, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_4); } else @@ -11786,13 +11792,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_26buildBind(CYTHON_UNUSED #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_8)) { PyObject *__pyx_temp[3] = {__pyx_t_3, __pyx_v_widget, __pyx_v_desc}; - __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 331, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 330, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_4); } else #endif { - __pyx_t_2 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 331, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 330, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); if (__pyx_t_3) { __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_3); __pyx_t_3 = NULL; @@ -11803,7 +11809,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_26buildBind(CYTHON_UNUSED __Pyx_INCREF(__pyx_v_desc); __Pyx_GIVEREF(__pyx_v_desc); PyTuple_SET_ITEM(__pyx_t_2, 1+__pyx_t_7, __pyx_v_desc); - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_2, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 331, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_2, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 330, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } @@ -11811,7 +11817,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_26buildBind(CYTHON_UNUSED __pyx_v_f = __pyx_t_4; __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":332 + /* "kivyblocks/blocks.pyx":331 * return * f = self.buildAction(widget,desc) * if f is None: # <<<<<<<<<<<<<< @@ -11822,19 +11828,19 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_26buildBind(CYTHON_UNUSED __pyx_t_6 = (__pyx_t_5 != 0); if (__pyx_t_6) { - /* "kivyblocks/blocks.pyx":333 + /* "kivyblocks/blocks.pyx":332 * f = self.buildAction(widget,desc) * if f is None: * Logger.info('Block: get a null function,%s',str(desc)) # <<<<<<<<<<<<<< * return * w.bind(**{event:f}) */ - __Pyx_GetModuleGlobalName(__pyx_t_8, __pyx_n_s_Logger); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 333, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_8, __pyx_n_s_Logger); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 332, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_info); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 333, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_info); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 332, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - __pyx_t_8 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyString_Type)), __pyx_v_desc); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 333, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyString_Type)), __pyx_v_desc); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 332, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __pyx_t_3 = NULL; __pyx_t_7 = 0; @@ -11851,7 +11857,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_26buildBind(CYTHON_UNUSED #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_2)) { PyObject *__pyx_temp[3] = {__pyx_t_3, __pyx_kp_s_Block_get_a_null_function_s, __pyx_t_8}; - __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 333, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 332, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; @@ -11860,14 +11866,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_26buildBind(CYTHON_UNUSED #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_2)) { PyObject *__pyx_temp[3] = {__pyx_t_3, __pyx_kp_s_Block_get_a_null_function_s, __pyx_t_8}; - __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 333, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 332, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; } else #endif { - __pyx_t_1 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 333, __pyx_L1_error) + __pyx_t_1 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 332, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); if (__pyx_t_3) { __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_3); __pyx_t_3 = NULL; @@ -11878,14 +11884,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_26buildBind(CYTHON_UNUSED __Pyx_GIVEREF(__pyx_t_8); PyTuple_SET_ITEM(__pyx_t_1, 1+__pyx_t_7, __pyx_t_8); __pyx_t_8 = 0; - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_1, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 333, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_1, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 332, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; } __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":334 + /* "kivyblocks/blocks.pyx":333 * if f is None: * Logger.info('Block: get a null function,%s',str(desc)) * return # <<<<<<<<<<<<<< @@ -11896,7 +11902,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_26buildBind(CYTHON_UNUSED __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "kivyblocks/blocks.pyx":332 + /* "kivyblocks/blocks.pyx":331 * return * f = self.buildAction(widget,desc) * if f is None: # <<<<<<<<<<<<<< @@ -11905,29 +11911,29 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_26buildBind(CYTHON_UNUSED */ } - /* "kivyblocks/blocks.pyx":335 + /* "kivyblocks/blocks.pyx":334 * Logger.info('Block: get a null function,%s',str(desc)) * return * w.bind(**{event:f}) # <<<<<<<<<<<<<< * # Logger.info('Block: %s bind built', str(desc)) * */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_w, __pyx_n_s_bind); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 335, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_w, __pyx_n_s_bind); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 334, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_2 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 335, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 334, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); if (unlikely(PyDict_Contains(__pyx_t_2, __pyx_v_event))) { - __Pyx_RaiseDoubleKeywordsError("function", __pyx_v_event); __PYX_ERR(0, 335, __pyx_L1_error) + __Pyx_RaiseDoubleKeywordsError("function", __pyx_v_event); __PYX_ERR(0, 334, __pyx_L1_error) } else { - if (PyDict_SetItem(__pyx_t_2, __pyx_v_event, __pyx_v_f) < 0) __PYX_ERR(0, 335, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_2, __pyx_v_event, __pyx_v_f) < 0) __PYX_ERR(0, 334, __pyx_L1_error) } - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_empty_tuple, __pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 335, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_empty_tuple, __pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 334, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":320 + /* "kivyblocks/blocks.pyx":319 * self.buildBind(widget,kw) * * def buildBind(self, widget:Widget, desc): # <<<<<<<<<<<<<< @@ -11956,7 +11962,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_26buildBind(CYTHON_UNUSED return __pyx_r; } -/* "kivyblocks/blocks.pyx":338 +/* "kivyblocks/blocks.pyx":337 * # Logger.info('Block: %s bind built', str(desc)) * * def multipleAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< @@ -12013,18 +12019,18 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_29multipleAction(PyObject case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_widget)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("multipleAction", 0, 3, 3, 1); __PYX_ERR(0, 338, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("multipleAction", 0, 3, 3, 1); __PYX_ERR(0, 337, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: if (likely((values[2] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_desc)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("multipleAction", 0, 3, 3, 2); __PYX_ERR(0, 338, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("multipleAction", 0, 3, 3, 2); __PYX_ERR(0, 337, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { const Py_ssize_t used_pos_args = (pos_args < 3) ? pos_args : 3; - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, used_pos_args, "multipleAction") < 0)) __PYX_ERR(0, 338, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, used_pos_args, "multipleAction") < 0)) __PYX_ERR(0, 337, __pyx_L3_error) } } else if (PyTuple_GET_SIZE(__pyx_args) < 3) { goto __pyx_L5_argtuple_error; @@ -12039,7 +12045,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_29multipleAction(PyObject } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("multipleAction", 0, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 338, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("multipleAction", 0, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 337, __pyx_L3_error) __pyx_L3_error:; __Pyx_DECREF(__pyx_v_args); __pyx_v_args = 0; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.multipleAction", __pyx_clineno, __pyx_lineno, __pyx_filename); @@ -12078,7 +12084,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_28multipleAction(CYTHON_U int __pyx_clineno = 0; __Pyx_RefNannySetupContext("multipleAction", 0); - /* "kivyblocks/blocks.pyx":339 + /* "kivyblocks/blocks.pyx":338 * * def multipleAction(self, widget:Widget, desc, *args): * desc1 = {k:v for k, v in desc.items() if k != 'actions'} # <<<<<<<<<<<<<< @@ -12086,9 +12092,9 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_28multipleAction(CYTHON_U * for a in desc['actions']: */ { /* enter inner scope */ - __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 339, __pyx_L5_error) + __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 338, __pyx_L5_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_items); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 339, __pyx_L5_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_items); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 338, __pyx_L5_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_4 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_3))) { @@ -12102,16 +12108,16 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_28multipleAction(CYTHON_U } __pyx_t_2 = (__pyx_t_4) ? __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_4) : __Pyx_PyObject_CallNoArg(__pyx_t_3); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 339, __pyx_L5_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 338, __pyx_L5_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; if (likely(PyList_CheckExact(__pyx_t_2)) || PyTuple_CheckExact(__pyx_t_2)) { __pyx_t_3 = __pyx_t_2; __Pyx_INCREF(__pyx_t_3); __pyx_t_5 = 0; __pyx_t_6 = NULL; } else { - __pyx_t_5 = -1; __pyx_t_3 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 339, __pyx_L5_error) + __pyx_t_5 = -1; __pyx_t_3 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 338, __pyx_L5_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_6 = Py_TYPE(__pyx_t_3)->tp_iternext; if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 339, __pyx_L5_error) + __pyx_t_6 = Py_TYPE(__pyx_t_3)->tp_iternext; if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 338, __pyx_L5_error) } __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; for (;;) { @@ -12119,17 +12125,17 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_28multipleAction(CYTHON_U if (likely(PyList_CheckExact(__pyx_t_3))) { if (__pyx_t_5 >= PyList_GET_SIZE(__pyx_t_3)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_2 = PyList_GET_ITEM(__pyx_t_3, __pyx_t_5); __Pyx_INCREF(__pyx_t_2); __pyx_t_5++; if (unlikely(0 < 0)) __PYX_ERR(0, 339, __pyx_L5_error) + __pyx_t_2 = PyList_GET_ITEM(__pyx_t_3, __pyx_t_5); __Pyx_INCREF(__pyx_t_2); __pyx_t_5++; if (unlikely(0 < 0)) __PYX_ERR(0, 338, __pyx_L5_error) #else - __pyx_t_2 = PySequence_ITEM(__pyx_t_3, __pyx_t_5); __pyx_t_5++; if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 339, __pyx_L5_error) + __pyx_t_2 = PySequence_ITEM(__pyx_t_3, __pyx_t_5); __pyx_t_5++; if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 338, __pyx_L5_error) __Pyx_GOTREF(__pyx_t_2); #endif } else { if (__pyx_t_5 >= PyTuple_GET_SIZE(__pyx_t_3)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_3, __pyx_t_5); __Pyx_INCREF(__pyx_t_2); __pyx_t_5++; if (unlikely(0 < 0)) __PYX_ERR(0, 339, __pyx_L5_error) + __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_3, __pyx_t_5); __Pyx_INCREF(__pyx_t_2); __pyx_t_5++; if (unlikely(0 < 0)) __PYX_ERR(0, 338, __pyx_L5_error) #else - __pyx_t_2 = PySequence_ITEM(__pyx_t_3, __pyx_t_5); __pyx_t_5++; if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 339, __pyx_L5_error) + __pyx_t_2 = PySequence_ITEM(__pyx_t_3, __pyx_t_5); __pyx_t_5++; if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 338, __pyx_L5_error) __Pyx_GOTREF(__pyx_t_2); #endif } @@ -12139,7 +12145,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_28multipleAction(CYTHON_U PyObject* exc_type = PyErr_Occurred(); if (exc_type) { if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); - else __PYX_ERR(0, 339, __pyx_L5_error) + else __PYX_ERR(0, 338, __pyx_L5_error) } break; } @@ -12151,7 +12157,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_28multipleAction(CYTHON_U if (unlikely(size != 2)) { if (size > 2) __Pyx_RaiseTooManyValuesError(2); else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size); - __PYX_ERR(0, 339, __pyx_L5_error) + __PYX_ERR(0, 338, __pyx_L5_error) } #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS if (likely(PyTuple_CheckExact(sequence))) { @@ -12164,15 +12170,15 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_28multipleAction(CYTHON_U __Pyx_INCREF(__pyx_t_4); __Pyx_INCREF(__pyx_t_7); #else - __pyx_t_4 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 339, __pyx_L5_error) + __pyx_t_4 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 338, __pyx_L5_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_7 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 339, __pyx_L5_error) + __pyx_t_7 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 338, __pyx_L5_error) __Pyx_GOTREF(__pyx_t_7); #endif __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } else { Py_ssize_t index = -1; - __pyx_t_8 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 339, __pyx_L5_error) + __pyx_t_8 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 338, __pyx_L5_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_t_9 = Py_TYPE(__pyx_t_8)->tp_iternext; @@ -12180,7 +12186,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_28multipleAction(CYTHON_U __Pyx_GOTREF(__pyx_t_4); index = 1; __pyx_t_7 = __pyx_t_9(__pyx_t_8); if (unlikely(!__pyx_t_7)) goto __pyx_L8_unpacking_failed; __Pyx_GOTREF(__pyx_t_7); - if (__Pyx_IternextUnpackEndCheck(__pyx_t_9(__pyx_t_8), 2) < 0) __PYX_ERR(0, 339, __pyx_L5_error) + if (__Pyx_IternextUnpackEndCheck(__pyx_t_9(__pyx_t_8), 2) < 0) __PYX_ERR(0, 338, __pyx_L5_error) __pyx_t_9 = NULL; __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; goto __pyx_L9_unpacking_done; @@ -12188,16 +12194,16 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_28multipleAction(CYTHON_U __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __pyx_t_9 = NULL; if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index); - __PYX_ERR(0, 339, __pyx_L5_error) + __PYX_ERR(0, 338, __pyx_L5_error) __pyx_L9_unpacking_done:; } __Pyx_XDECREF_SET(__pyx_7genexpr__pyx_v_k, __pyx_t_4); __pyx_t_4 = 0; __Pyx_XDECREF_SET(__pyx_7genexpr__pyx_v_v, __pyx_t_7); __pyx_t_7 = 0; - __pyx_t_10 = (__Pyx_PyString_Equals(__pyx_7genexpr__pyx_v_k, __pyx_n_s_actions, Py_NE)); if (unlikely(__pyx_t_10 < 0)) __PYX_ERR(0, 339, __pyx_L5_error) + __pyx_t_10 = (__Pyx_PyString_Equals(__pyx_7genexpr__pyx_v_k, __pyx_n_s_actions, Py_NE)); if (unlikely(__pyx_t_10 < 0)) __PYX_ERR(0, 338, __pyx_L5_error) if (__pyx_t_10) { - if (unlikely(PyDict_SetItem(__pyx_t_1, (PyObject*)__pyx_7genexpr__pyx_v_k, (PyObject*)__pyx_7genexpr__pyx_v_v))) __PYX_ERR(0, 339, __pyx_L5_error) + if (unlikely(PyDict_SetItem(__pyx_t_1, (PyObject*)__pyx_7genexpr__pyx_v_k, (PyObject*)__pyx_7genexpr__pyx_v_v))) __PYX_ERR(0, 338, __pyx_L5_error) } } __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -12213,34 +12219,34 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_28multipleAction(CYTHON_U __pyx_v_desc1 = ((PyObject*)__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":340 + /* "kivyblocks/blocks.pyx":339 * def multipleAction(self, widget:Widget, desc, *args): * desc1 = {k:v for k, v in desc.items() if k != 'actions'} * mydesc = desc1.copy() # <<<<<<<<<<<<<< * for a in desc['actions']: * new_desc = mydesc.copy() */ - __pyx_t_1 = PyDict_Copy(__pyx_v_desc1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 340, __pyx_L1_error) + __pyx_t_1 = PyDict_Copy(__pyx_v_desc1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 339, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_v_mydesc = ((PyObject*)__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":341 + /* "kivyblocks/blocks.pyx":340 * desc1 = {k:v for k, v in desc.items() if k != 'actions'} * mydesc = desc1.copy() * for a in desc['actions']: # <<<<<<<<<<<<<< * new_desc = mydesc.copy() * new_desc.update(a) */ - __pyx_t_1 = __Pyx_PyObject_Dict_GetItem(__pyx_v_desc, __pyx_n_s_actions); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 341, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Dict_GetItem(__pyx_v_desc, __pyx_n_s_actions); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 340, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); if (likely(PyList_CheckExact(__pyx_t_1)) || PyTuple_CheckExact(__pyx_t_1)) { __pyx_t_3 = __pyx_t_1; __Pyx_INCREF(__pyx_t_3); __pyx_t_5 = 0; __pyx_t_6 = NULL; } else { - __pyx_t_5 = -1; __pyx_t_3 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 341, __pyx_L1_error) + __pyx_t_5 = -1; __pyx_t_3 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 340, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_6 = Py_TYPE(__pyx_t_3)->tp_iternext; if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 341, __pyx_L1_error) + __pyx_t_6 = Py_TYPE(__pyx_t_3)->tp_iternext; if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 340, __pyx_L1_error) } __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; for (;;) { @@ -12248,17 +12254,17 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_28multipleAction(CYTHON_U if (likely(PyList_CheckExact(__pyx_t_3))) { if (__pyx_t_5 >= PyList_GET_SIZE(__pyx_t_3)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_1 = PyList_GET_ITEM(__pyx_t_3, __pyx_t_5); __Pyx_INCREF(__pyx_t_1); __pyx_t_5++; if (unlikely(0 < 0)) __PYX_ERR(0, 341, __pyx_L1_error) + __pyx_t_1 = PyList_GET_ITEM(__pyx_t_3, __pyx_t_5); __Pyx_INCREF(__pyx_t_1); __pyx_t_5++; if (unlikely(0 < 0)) __PYX_ERR(0, 340, __pyx_L1_error) #else - __pyx_t_1 = PySequence_ITEM(__pyx_t_3, __pyx_t_5); __pyx_t_5++; if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 341, __pyx_L1_error) + __pyx_t_1 = PySequence_ITEM(__pyx_t_3, __pyx_t_5); __pyx_t_5++; if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 340, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); #endif } else { if (__pyx_t_5 >= PyTuple_GET_SIZE(__pyx_t_3)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_1 = PyTuple_GET_ITEM(__pyx_t_3, __pyx_t_5); __Pyx_INCREF(__pyx_t_1); __pyx_t_5++; if (unlikely(0 < 0)) __PYX_ERR(0, 341, __pyx_L1_error) + __pyx_t_1 = PyTuple_GET_ITEM(__pyx_t_3, __pyx_t_5); __Pyx_INCREF(__pyx_t_1); __pyx_t_5++; if (unlikely(0 < 0)) __PYX_ERR(0, 340, __pyx_L1_error) #else - __pyx_t_1 = PySequence_ITEM(__pyx_t_3, __pyx_t_5); __pyx_t_5++; if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 341, __pyx_L1_error) + __pyx_t_1 = PySequence_ITEM(__pyx_t_3, __pyx_t_5); __pyx_t_5++; if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 340, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); #endif } @@ -12268,7 +12274,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_28multipleAction(CYTHON_U PyObject* exc_type = PyErr_Occurred(); if (exc_type) { if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); - else __PYX_ERR(0, 341, __pyx_L1_error) + else __PYX_ERR(0, 340, __pyx_L1_error) } break; } @@ -12277,7 +12283,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_28multipleAction(CYTHON_U __Pyx_XDECREF_SET(__pyx_v_a, __pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":342 + /* "kivyblocks/blocks.pyx":341 * mydesc = desc1.copy() * for a in desc['actions']: * new_desc = mydesc.copy() # <<<<<<<<<<<<<< @@ -12286,34 +12292,34 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_28multipleAction(CYTHON_U */ if (unlikely(__pyx_v_mydesc == Py_None)) { PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%.30s'", "copy"); - __PYX_ERR(0, 342, __pyx_L1_error) + __PYX_ERR(0, 341, __pyx_L1_error) } - __pyx_t_1 = PyDict_Copy(__pyx_v_mydesc); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 342, __pyx_L1_error) + __pyx_t_1 = PyDict_Copy(__pyx_v_mydesc); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 341, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_XDECREF_SET(__pyx_v_new_desc, ((PyObject*)__pyx_t_1)); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":343 + /* "kivyblocks/blocks.pyx":342 * for a in desc['actions']: * new_desc = mydesc.copy() * new_desc.update(a) # <<<<<<<<<<<<<< * self.uniaction(widget,new_desc, *args) * */ - __pyx_t_1 = __Pyx_CallUnboundCMethod1(&__pyx_umethod_PyDict_Type_update, __pyx_v_new_desc, __pyx_v_a); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 343, __pyx_L1_error) + __pyx_t_1 = __Pyx_CallUnboundCMethod1(&__pyx_umethod_PyDict_Type_update, __pyx_v_new_desc, __pyx_v_a); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 342, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":344 + /* "kivyblocks/blocks.pyx":343 * new_desc = mydesc.copy() * new_desc.update(a) * self.uniaction(widget,new_desc, *args) # <<<<<<<<<<<<<< * * def conform_action(self, widget:Widget, desc, *args): */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_uniaction); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 344, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_uniaction); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 343, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 344, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 343, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_v_widget); __Pyx_GIVEREF(__pyx_v_widget); @@ -12321,16 +12327,16 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_28multipleAction(CYTHON_U __Pyx_INCREF(__pyx_v_new_desc); __Pyx_GIVEREF(__pyx_v_new_desc); PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_v_new_desc); - __pyx_t_7 = PyNumber_Add(__pyx_t_2, __pyx_v_args); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 344, __pyx_L1_error) + __pyx_t_7 = PyNumber_Add(__pyx_t_2, __pyx_v_args); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 343, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_7, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 344, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_7, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 343, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":341 + /* "kivyblocks/blocks.pyx":340 * desc1 = {k:v for k, v in desc.items() if k != 'actions'} * mydesc = desc1.copy() * for a in desc['actions']: # <<<<<<<<<<<<<< @@ -12340,7 +12346,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_28multipleAction(CYTHON_U } __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":338 + /* "kivyblocks/blocks.pyx":337 * # Logger.info('Block: %s bind built', str(desc)) * * def multipleAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< @@ -12372,7 +12378,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_28multipleAction(CYTHON_U return __pyx_r; } -/* "kivyblocks/blocks.pyx":346 +/* "kivyblocks/blocks.pyx":345 * self.uniaction(widget,new_desc, *args) * * def conform_action(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< @@ -12429,18 +12435,18 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_31conform_action(PyObject case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_widget)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("conform_action", 0, 3, 3, 1); __PYX_ERR(0, 346, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("conform_action", 0, 3, 3, 1); __PYX_ERR(0, 345, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: if (likely((values[2] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_desc)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("conform_action", 0, 3, 3, 2); __PYX_ERR(0, 346, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("conform_action", 0, 3, 3, 2); __PYX_ERR(0, 345, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { const Py_ssize_t used_pos_args = (pos_args < 3) ? pos_args : 3; - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, used_pos_args, "conform_action") < 0)) __PYX_ERR(0, 346, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, used_pos_args, "conform_action") < 0)) __PYX_ERR(0, 345, __pyx_L3_error) } } else if (PyTuple_GET_SIZE(__pyx_args) < 3) { goto __pyx_L5_argtuple_error; @@ -12455,7 +12461,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_31conform_action(PyObject } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("conform_action", 0, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 346, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("conform_action", 0, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 345, __pyx_L3_error) __pyx_L3_error:; __Pyx_DECREF(__pyx_v_args); __pyx_v_args = 0; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.conform_action", __pyx_clineno, __pyx_lineno, __pyx_filename); @@ -12491,14 +12497,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_30conform_action(CYTHON_U int __pyx_clineno = 0; __Pyx_RefNannySetupContext("conform_action", 0); - /* "kivyblocks/blocks.pyx":347 + /* "kivyblocks/blocks.pyx":346 * * def conform_action(self, widget:Widget, desc, *args): * conform_desc = desc.get('conform') # <<<<<<<<<<<<<< * blocks = Blocks() * if not conform_desc: */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 347, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 346, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { @@ -12512,20 +12518,20 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_30conform_action(CYTHON_U } __pyx_t_1 = (__pyx_t_3) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_3, __pyx_n_s_conform) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_n_s_conform); __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 347, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 346, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_v_conform_desc = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":348 + /* "kivyblocks/blocks.pyx":347 * def conform_action(self, widget:Widget, desc, *args): * conform_desc = desc.get('conform') * blocks = Blocks() # <<<<<<<<<<<<<< * if not conform_desc: * blocks.uniaction(widget, desc,*args, **kw) */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Blocks); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 348, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Blocks); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 347, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = NULL; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_2))) { @@ -12539,33 +12545,33 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_30conform_action(CYTHON_U } __pyx_t_1 = (__pyx_t_3) ? __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_t_3) : __Pyx_PyObject_CallNoArg(__pyx_t_2); __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 348, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 347, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_v_blocks = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":349 + /* "kivyblocks/blocks.pyx":348 * conform_desc = desc.get('conform') * blocks = Blocks() * if not conform_desc: # <<<<<<<<<<<<<< * blocks.uniaction(widget, desc,*args, **kw) * return */ - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_v_conform_desc); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 349, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_v_conform_desc); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 348, __pyx_L1_error) __pyx_t_5 = ((!__pyx_t_4) != 0); if (__pyx_t_5) { - /* "kivyblocks/blocks.pyx":350 + /* "kivyblocks/blocks.pyx":349 * blocks = Blocks() * if not conform_desc: * blocks.uniaction(widget, desc,*args, **kw) # <<<<<<<<<<<<<< * return * w = blocks.widgetBuild({ */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_blocks, __pyx_n_s_uniaction); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 350, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_blocks, __pyx_n_s_uniaction); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 349, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 350, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 349, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_v_widget); __Pyx_GIVEREF(__pyx_v_widget); @@ -12573,32 +12579,32 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_30conform_action(CYTHON_U __Pyx_INCREF(__pyx_v_desc); __Pyx_GIVEREF(__pyx_v_desc); PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_v_desc); - __pyx_t_3 = PyNumber_Add(__pyx_t_2, __pyx_v_args); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 350, __pyx_L1_error) + __pyx_t_3 = PyNumber_Add(__pyx_t_2, __pyx_v_args); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 349, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_kw); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 350, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_kw); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 349, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); if (unlikely(__pyx_t_6 == Py_None)) { PyErr_SetString(PyExc_TypeError, "argument after ** must be a mapping, not NoneType"); - __PYX_ERR(0, 350, __pyx_L1_error) + __PYX_ERR(0, 349, __pyx_L1_error) } if (likely(PyDict_CheckExact(__pyx_t_6))) { - __pyx_t_2 = PyDict_Copy(__pyx_t_6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 350, __pyx_L1_error) + __pyx_t_2 = PyDict_Copy(__pyx_t_6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 349, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; } else { - __pyx_t_2 = PyObject_CallFunctionObjArgs((PyObject*)&PyDict_Type, __pyx_t_6, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 350, __pyx_L1_error) + __pyx_t_2 = PyObject_CallFunctionObjArgs((PyObject*)&PyDict_Type, __pyx_t_6, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 349, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; } - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_3, __pyx_t_2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 350, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_3, __pyx_t_2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 349, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - /* "kivyblocks/blocks.pyx":351 + /* "kivyblocks/blocks.pyx":350 * if not conform_desc: * blocks.uniaction(widget, desc,*args, **kw) * return # <<<<<<<<<<<<<< @@ -12609,7 +12615,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_30conform_action(CYTHON_U __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "kivyblocks/blocks.pyx":349 + /* "kivyblocks/blocks.pyx":348 * conform_desc = desc.get('conform') * blocks = Blocks() * if not conform_desc: # <<<<<<<<<<<<<< @@ -12618,35 +12624,35 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_30conform_action(CYTHON_U */ } - /* "kivyblocks/blocks.pyx":352 + /* "kivyblocks/blocks.pyx":351 * blocks.uniaction(widget, desc,*args, **kw) * return * w = blocks.widgetBuild({ # <<<<<<<<<<<<<< * "widgettype":"Conform", * "options":conform_desc */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_blocks, __pyx_n_s_widgetBuild); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 352, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_blocks, __pyx_n_s_widgetBuild); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 351, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - /* "kivyblocks/blocks.pyx":353 + /* "kivyblocks/blocks.pyx":352 * return * w = blocks.widgetBuild({ * "widgettype":"Conform", # <<<<<<<<<<<<<< * "options":conform_desc * }) */ - __pyx_t_3 = __Pyx_PyDict_NewPresized(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 353, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyDict_NewPresized(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 352, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_widgettype, __pyx_n_s_Conform) < 0) __PYX_ERR(0, 353, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_widgettype, __pyx_n_s_Conform) < 0) __PYX_ERR(0, 352, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":354 + /* "kivyblocks/blocks.pyx":353 * w = blocks.widgetBuild({ * "widgettype":"Conform", * "options":conform_desc # <<<<<<<<<<<<<< * }) * w.bind(on_conform=partial(blocks.uniaction, widget, desc)) */ - if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_options, __pyx_v_conform_desc) < 0) __PYX_ERR(0, 353, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_options, __pyx_v_conform_desc) < 0) __PYX_ERR(0, 352, __pyx_L1_error) __pyx_t_1 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { __pyx_t_1 = PyMethod_GET_SELF(__pyx_t_2); @@ -12660,26 +12666,26 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_30conform_action(CYTHON_U __pyx_t_6 = (__pyx_t_1) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_1, __pyx_t_3) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_t_3); __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 352, __pyx_L1_error) + if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 351, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_v_w = __pyx_t_6; __pyx_t_6 = 0; - /* "kivyblocks/blocks.pyx":356 + /* "kivyblocks/blocks.pyx":355 * "options":conform_desc * }) * w.bind(on_conform=partial(blocks.uniaction, widget, desc)) # <<<<<<<<<<<<<< * w.open() * */ - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_w, __pyx_n_s_bind); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 356, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_w, __pyx_n_s_bind); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 355, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - __pyx_t_2 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 356, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 355, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_partial); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 356, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_partial); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 355, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_blocks, __pyx_n_s_uniaction); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 356, __pyx_L1_error) + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_blocks, __pyx_n_s_uniaction); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 355, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __pyx_t_8 = NULL; __pyx_t_9 = 0; @@ -12696,7 +12702,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_30conform_action(CYTHON_U #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_1)) { PyObject *__pyx_temp[4] = {__pyx_t_8, __pyx_t_7, __pyx_v_widget, __pyx_v_desc}; - __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_9, 3+__pyx_t_9); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 356, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_9, 3+__pyx_t_9); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 355, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -12705,14 +12711,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_30conform_action(CYTHON_U #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_1)) { PyObject *__pyx_temp[4] = {__pyx_t_8, __pyx_t_7, __pyx_v_widget, __pyx_v_desc}; - __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_9, 3+__pyx_t_9); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 356, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_9, 3+__pyx_t_9); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 355, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; } else #endif { - __pyx_t_10 = PyTuple_New(3+__pyx_t_9); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 356, __pyx_L1_error) + __pyx_t_10 = PyTuple_New(3+__pyx_t_9); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 355, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_10); if (__pyx_t_8) { __Pyx_GIVEREF(__pyx_t_8); PyTuple_SET_ITEM(__pyx_t_10, 0, __pyx_t_8); __pyx_t_8 = NULL; @@ -12726,27 +12732,27 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_30conform_action(CYTHON_U __Pyx_GIVEREF(__pyx_v_desc); PyTuple_SET_ITEM(__pyx_t_10, 2+__pyx_t_9, __pyx_v_desc); __pyx_t_7 = 0; - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_10, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 356, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_10, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 355, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; } __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_on_conform, __pyx_t_3) < 0) __PYX_ERR(0, 356, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_on_conform, __pyx_t_3) < 0) __PYX_ERR(0, 355, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_empty_tuple, __pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 356, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_empty_tuple, __pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 355, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":357 + /* "kivyblocks/blocks.pyx":356 * }) * w.bind(on_conform=partial(blocks.uniaction, widget, desc)) * w.open() # <<<<<<<<<<<<<< * * def uniaction(self, widget:Widget, desc, *args): */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_w, __pyx_n_s_open); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 357, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_w, __pyx_n_s_open); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 356, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_6 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { @@ -12760,12 +12766,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_30conform_action(CYTHON_U } __pyx_t_3 = (__pyx_t_6) ? __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_t_6) : __Pyx_PyObject_CallNoArg(__pyx_t_2); __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; - if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 357, __pyx_L1_error) + if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 356, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":346 + /* "kivyblocks/blocks.pyx":345 * self.uniaction(widget,new_desc, *args) * * def conform_action(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< @@ -12795,7 +12801,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_30conform_action(CYTHON_U return __pyx_r; } -/* "kivyblocks/blocks.pyx":359 +/* "kivyblocks/blocks.pyx":358 * w.open() * * def uniaction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< @@ -12852,18 +12858,18 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_33uniaction(PyObject *__p case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_widget)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("uniaction", 0, 3, 3, 1); __PYX_ERR(0, 359, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("uniaction", 0, 3, 3, 1); __PYX_ERR(0, 358, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: if (likely((values[2] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_desc)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("uniaction", 0, 3, 3, 2); __PYX_ERR(0, 359, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("uniaction", 0, 3, 3, 2); __PYX_ERR(0, 358, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { const Py_ssize_t used_pos_args = (pos_args < 3) ? pos_args : 3; - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, used_pos_args, "uniaction") < 0)) __PYX_ERR(0, 359, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, used_pos_args, "uniaction") < 0)) __PYX_ERR(0, 358, __pyx_L3_error) } } else if (PyTuple_GET_SIZE(__pyx_args) < 3) { goto __pyx_L5_argtuple_error; @@ -12878,7 +12884,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_33uniaction(PyObject *__p } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("uniaction", 0, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 359, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("uniaction", 0, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 358, __pyx_L3_error) __pyx_L3_error:; __Pyx_DECREF(__pyx_v_args); __pyx_v_args = 0; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.uniaction", __pyx_clineno, __pyx_lineno, __pyx_filename); @@ -12909,30 +12915,30 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED int __pyx_clineno = 0; __Pyx_RefNannySetupContext("uniaction", 0); - /* "kivyblocks/blocks.pyx":360 + /* "kivyblocks/blocks.pyx":359 * * def uniaction(self, widget:Widget, desc, *args): * Logger.info('Block: uniaction() called, desc=%s, args=%s', \ # <<<<<<<<<<<<<< * str(desc), * args */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Logger); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 360, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Logger); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 359, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_info); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 360, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_info); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 359, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":361 + /* "kivyblocks/blocks.pyx":360 * def uniaction(self, widget:Widget, desc, *args): * Logger.info('Block: uniaction() called, desc=%s, args=%s', \ * str(desc), # <<<<<<<<<<<<<< * args * ) */ - __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyString_Type)), __pyx_v_desc); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 361, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyString_Type)), __pyx_v_desc); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 360, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - /* "kivyblocks/blocks.pyx":362 + /* "kivyblocks/blocks.pyx":361 * Logger.info('Block: uniaction() called, desc=%s, args=%s', \ * str(desc), * args # <<<<<<<<<<<<<< @@ -12954,7 +12960,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_3)) { PyObject *__pyx_temp[4] = {__pyx_t_4, __pyx_kp_s_Block_uniaction_called_desc_s_ar, __pyx_t_2, __pyx_v_args}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 3+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 360, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 3+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 359, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; @@ -12963,14 +12969,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_3)) { PyObject *__pyx_temp[4] = {__pyx_t_4, __pyx_kp_s_Block_uniaction_called_desc_s_ar, __pyx_t_2, __pyx_v_args}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 3+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 360, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 3+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 359, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } else #endif { - __pyx_t_6 = PyTuple_New(3+__pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 360, __pyx_L1_error) + __pyx_t_6 = PyTuple_New(3+__pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 359, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); if (__pyx_t_4) { __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_4); __pyx_t_4 = NULL; @@ -12984,21 +12990,21 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED __Pyx_GIVEREF(__pyx_v_args); PyTuple_SET_ITEM(__pyx_t_6, 2+__pyx_t_5, __pyx_v_args); __pyx_t_2 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 360, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 359, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; } __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":365 + /* "kivyblocks/blocks.pyx":364 * ) * * acttype = desc.get('actiontype') # <<<<<<<<<<<<<< * if acttype=='blocks': * return self.blocksAction(widget,desc, *args) */ - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 365, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 364, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_6 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_3))) { @@ -13012,23 +13018,23 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED } __pyx_t_1 = (__pyx_t_6) ? __Pyx_PyObject_Call2Args(__pyx_t_3, __pyx_t_6, __pyx_n_s_actiontype) : __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_n_s_actiontype); __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 365, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 364, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_v_acttype = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":366 + /* "kivyblocks/blocks.pyx":365 * * acttype = desc.get('actiontype') * if acttype=='blocks': # <<<<<<<<<<<<<< * return self.blocksAction(widget,desc, *args) * if acttype=='urlwidget': */ - __pyx_t_7 = (__Pyx_PyString_Equals(__pyx_v_acttype, __pyx_n_s_blocks, Py_EQ)); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 366, __pyx_L1_error) + __pyx_t_7 = (__Pyx_PyString_Equals(__pyx_v_acttype, __pyx_n_s_blocks, Py_EQ)); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 365, __pyx_L1_error) if (__pyx_t_7) { - /* "kivyblocks/blocks.pyx":367 + /* "kivyblocks/blocks.pyx":366 * acttype = desc.get('actiontype') * if acttype=='blocks': * return self.blocksAction(widget,desc, *args) # <<<<<<<<<<<<<< @@ -13036,9 +13042,9 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED * return self.urlwidgetAction(widget,desc, *args) */ __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_blocksAction); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 367, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_blocksAction); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 366, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 367, __pyx_L1_error) + __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 366, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_INCREF(__pyx_v_widget); __Pyx_GIVEREF(__pyx_v_widget); @@ -13046,10 +13052,10 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED __Pyx_INCREF(__pyx_v_desc); __Pyx_GIVEREF(__pyx_v_desc); PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_v_desc); - __pyx_t_6 = PyNumber_Add(__pyx_t_3, __pyx_v_args); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 367, __pyx_L1_error) + __pyx_t_6 = PyNumber_Add(__pyx_t_3, __pyx_v_args); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 366, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_6, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 367, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_6, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 366, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; @@ -13057,7 +13063,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED __pyx_t_3 = 0; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":366 + /* "kivyblocks/blocks.pyx":365 * * acttype = desc.get('actiontype') * if acttype=='blocks': # <<<<<<<<<<<<<< @@ -13066,17 +13072,17 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED */ } - /* "kivyblocks/blocks.pyx":368 + /* "kivyblocks/blocks.pyx":367 * if acttype=='blocks': * return self.blocksAction(widget,desc, *args) * if acttype=='urlwidget': # <<<<<<<<<<<<<< * return self.urlwidgetAction(widget,desc, *args) * if acttype == 'registedfunction': */ - __pyx_t_7 = (__Pyx_PyString_Equals(__pyx_v_acttype, __pyx_n_s_urlwidget, Py_EQ)); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 368, __pyx_L1_error) + __pyx_t_7 = (__Pyx_PyString_Equals(__pyx_v_acttype, __pyx_n_s_urlwidget, Py_EQ)); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 367, __pyx_L1_error) if (__pyx_t_7) { - /* "kivyblocks/blocks.pyx":369 + /* "kivyblocks/blocks.pyx":368 * return self.blocksAction(widget,desc, *args) * if acttype=='urlwidget': * return self.urlwidgetAction(widget,desc, *args) # <<<<<<<<<<<<<< @@ -13084,9 +13090,9 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED * return self.registedfunctionAction(widget,desc, *args) */ __Pyx_XDECREF(__pyx_r); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_urlwidgetAction); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 369, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_urlwidgetAction); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 368, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 369, __pyx_L1_error) + __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 368, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_INCREF(__pyx_v_widget); __Pyx_GIVEREF(__pyx_v_widget); @@ -13094,10 +13100,10 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED __Pyx_INCREF(__pyx_v_desc); __Pyx_GIVEREF(__pyx_v_desc); PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_v_desc); - __pyx_t_1 = PyNumber_Add(__pyx_t_6, __pyx_v_args); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 369, __pyx_L1_error) + __pyx_t_1 = PyNumber_Add(__pyx_t_6, __pyx_v_args); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 368, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_1, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 369, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_1, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 368, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; @@ -13105,7 +13111,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED __pyx_t_6 = 0; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":368 + /* "kivyblocks/blocks.pyx":367 * if acttype=='blocks': * return self.blocksAction(widget,desc, *args) * if acttype=='urlwidget': # <<<<<<<<<<<<<< @@ -13114,17 +13120,17 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED */ } - /* "kivyblocks/blocks.pyx":370 + /* "kivyblocks/blocks.pyx":369 * if acttype=='urlwidget': * return self.urlwidgetAction(widget,desc, *args) * if acttype == 'registedfunction': # <<<<<<<<<<<<<< * return self.registedfunctionAction(widget,desc, *args) * if acttype == 'script': */ - __pyx_t_7 = (__Pyx_PyString_Equals(__pyx_v_acttype, __pyx_n_s_registedfunction, Py_EQ)); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 370, __pyx_L1_error) + __pyx_t_7 = (__Pyx_PyString_Equals(__pyx_v_acttype, __pyx_n_s_registedfunction, Py_EQ)); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 369, __pyx_L1_error) if (__pyx_t_7) { - /* "kivyblocks/blocks.pyx":371 + /* "kivyblocks/blocks.pyx":370 * return self.urlwidgetAction(widget,desc, *args) * if acttype == 'registedfunction': * return self.registedfunctionAction(widget,desc, *args) # <<<<<<<<<<<<<< @@ -13132,9 +13138,9 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED * return self.scriptAction(widget, desc, *args) */ __Pyx_XDECREF(__pyx_r); - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_registedfunctionAction); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 371, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_registedfunctionAction); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 370, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 371, __pyx_L1_error) + __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 370, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_v_widget); __Pyx_GIVEREF(__pyx_v_widget); @@ -13142,10 +13148,10 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED __Pyx_INCREF(__pyx_v_desc); __Pyx_GIVEREF(__pyx_v_desc); PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_v_desc); - __pyx_t_3 = PyNumber_Add(__pyx_t_1, __pyx_v_args); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 371, __pyx_L1_error) + __pyx_t_3 = PyNumber_Add(__pyx_t_1, __pyx_v_args); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 370, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 371, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 370, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -13153,7 +13159,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED __pyx_t_1 = 0; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":370 + /* "kivyblocks/blocks.pyx":369 * if acttype=='urlwidget': * return self.urlwidgetAction(widget,desc, *args) * if acttype == 'registedfunction': # <<<<<<<<<<<<<< @@ -13162,17 +13168,17 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED */ } - /* "kivyblocks/blocks.pyx":372 + /* "kivyblocks/blocks.pyx":371 * if acttype == 'registedfunction': * return self.registedfunctionAction(widget,desc, *args) * if acttype == 'script': # <<<<<<<<<<<<<< * return self.scriptAction(widget, desc, *args) * if acttype == 'method': */ - __pyx_t_7 = (__Pyx_PyString_Equals(__pyx_v_acttype, __pyx_n_s_script_2, Py_EQ)); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 372, __pyx_L1_error) + __pyx_t_7 = (__Pyx_PyString_Equals(__pyx_v_acttype, __pyx_n_s_script_2, Py_EQ)); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 371, __pyx_L1_error) if (__pyx_t_7) { - /* "kivyblocks/blocks.pyx":373 + /* "kivyblocks/blocks.pyx":372 * return self.registedfunctionAction(widget,desc, *args) * if acttype == 'script': * return self.scriptAction(widget, desc, *args) # <<<<<<<<<<<<<< @@ -13180,9 +13186,9 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED * return self.methodAction(widget, desc, *args) */ __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_scriptAction); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 373, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_scriptAction); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 372, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 373, __pyx_L1_error) + __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 372, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_INCREF(__pyx_v_widget); __Pyx_GIVEREF(__pyx_v_widget); @@ -13190,10 +13196,10 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED __Pyx_INCREF(__pyx_v_desc); __Pyx_GIVEREF(__pyx_v_desc); PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_v_desc); - __pyx_t_6 = PyNumber_Add(__pyx_t_3, __pyx_v_args); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 373, __pyx_L1_error) + __pyx_t_6 = PyNumber_Add(__pyx_t_3, __pyx_v_args); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 372, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_6, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 373, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_6, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 372, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; @@ -13201,7 +13207,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED __pyx_t_3 = 0; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":372 + /* "kivyblocks/blocks.pyx":371 * if acttype == 'registedfunction': * return self.registedfunctionAction(widget,desc, *args) * if acttype == 'script': # <<<<<<<<<<<<<< @@ -13210,17 +13216,17 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED */ } - /* "kivyblocks/blocks.pyx":374 + /* "kivyblocks/blocks.pyx":373 * if acttype == 'script': * return self.scriptAction(widget, desc, *args) * if acttype == 'method': # <<<<<<<<<<<<<< * return self.methodAction(widget, desc, *args) * if acttype == 'event': */ - __pyx_t_7 = (__Pyx_PyString_Equals(__pyx_v_acttype, __pyx_n_s_method, Py_EQ)); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 374, __pyx_L1_error) + __pyx_t_7 = (__Pyx_PyString_Equals(__pyx_v_acttype, __pyx_n_s_method, Py_EQ)); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 373, __pyx_L1_error) if (__pyx_t_7) { - /* "kivyblocks/blocks.pyx":375 + /* "kivyblocks/blocks.pyx":374 * return self.scriptAction(widget, desc, *args) * if acttype == 'method': * return self.methodAction(widget, desc, *args) # <<<<<<<<<<<<<< @@ -13228,9 +13234,9 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED * return self.eventAction(widget, desc, *args) */ __Pyx_XDECREF(__pyx_r); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_methodAction); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 375, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_methodAction); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 374, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 375, __pyx_L1_error) + __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 374, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_INCREF(__pyx_v_widget); __Pyx_GIVEREF(__pyx_v_widget); @@ -13238,10 +13244,10 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED __Pyx_INCREF(__pyx_v_desc); __Pyx_GIVEREF(__pyx_v_desc); PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_v_desc); - __pyx_t_1 = PyNumber_Add(__pyx_t_6, __pyx_v_args); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 375, __pyx_L1_error) + __pyx_t_1 = PyNumber_Add(__pyx_t_6, __pyx_v_args); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 374, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_1, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 375, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_1, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 374, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; @@ -13249,7 +13255,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED __pyx_t_6 = 0; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":374 + /* "kivyblocks/blocks.pyx":373 * if acttype == 'script': * return self.scriptAction(widget, desc, *args) * if acttype == 'method': # <<<<<<<<<<<<<< @@ -13258,17 +13264,17 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED */ } - /* "kivyblocks/blocks.pyx":376 + /* "kivyblocks/blocks.pyx":375 * if acttype == 'method': * return self.methodAction(widget, desc, *args) * if acttype == 'event': # <<<<<<<<<<<<<< * return self.eventAction(widget, desc, *args) * if acttype == 'multiple': */ - __pyx_t_7 = (__Pyx_PyString_Equals(__pyx_v_acttype, __pyx_n_s_event, Py_EQ)); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 376, __pyx_L1_error) + __pyx_t_7 = (__Pyx_PyString_Equals(__pyx_v_acttype, __pyx_n_s_event, Py_EQ)); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 375, __pyx_L1_error) if (__pyx_t_7) { - /* "kivyblocks/blocks.pyx":377 + /* "kivyblocks/blocks.pyx":376 * return self.methodAction(widget, desc, *args) * if acttype == 'event': * return self.eventAction(widget, desc, *args) # <<<<<<<<<<<<<< @@ -13276,9 +13282,9 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED * return self.multipleAction(widget, desc, *args) */ __Pyx_XDECREF(__pyx_r); - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_eventAction); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 377, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_eventAction); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 376, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 377, __pyx_L1_error) + __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 376, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_v_widget); __Pyx_GIVEREF(__pyx_v_widget); @@ -13286,10 +13292,10 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED __Pyx_INCREF(__pyx_v_desc); __Pyx_GIVEREF(__pyx_v_desc); PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_v_desc); - __pyx_t_3 = PyNumber_Add(__pyx_t_1, __pyx_v_args); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 377, __pyx_L1_error) + __pyx_t_3 = PyNumber_Add(__pyx_t_1, __pyx_v_args); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 376, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 377, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 376, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -13297,7 +13303,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED __pyx_t_1 = 0; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":376 + /* "kivyblocks/blocks.pyx":375 * if acttype == 'method': * return self.methodAction(widget, desc, *args) * if acttype == 'event': # <<<<<<<<<<<<<< @@ -13306,17 +13312,17 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED */ } - /* "kivyblocks/blocks.pyx":378 + /* "kivyblocks/blocks.pyx":377 * if acttype == 'event': * return self.eventAction(widget, desc, *args) * if acttype == 'multiple': # <<<<<<<<<<<<<< * return self.multipleAction(widget, desc, *args) * */ - __pyx_t_7 = (__Pyx_PyString_Equals(__pyx_v_acttype, __pyx_n_s_multiple, Py_EQ)); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 378, __pyx_L1_error) + __pyx_t_7 = (__Pyx_PyString_Equals(__pyx_v_acttype, __pyx_n_s_multiple, Py_EQ)); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 377, __pyx_L1_error) if (__pyx_t_7) { - /* "kivyblocks/blocks.pyx":379 + /* "kivyblocks/blocks.pyx":378 * return self.eventAction(widget, desc, *args) * if acttype == 'multiple': * return self.multipleAction(widget, desc, *args) # <<<<<<<<<<<<<< @@ -13324,9 +13330,9 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED * alert("actiontype(%s) invalid" % acttype,title='error') */ __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_multipleAction); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 379, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_multipleAction); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 378, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 379, __pyx_L1_error) + __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 378, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_INCREF(__pyx_v_widget); __Pyx_GIVEREF(__pyx_v_widget); @@ -13334,10 +13340,10 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED __Pyx_INCREF(__pyx_v_desc); __Pyx_GIVEREF(__pyx_v_desc); PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_v_desc); - __pyx_t_6 = PyNumber_Add(__pyx_t_3, __pyx_v_args); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 379, __pyx_L1_error) + __pyx_t_6 = PyNumber_Add(__pyx_t_3, __pyx_v_args); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 378, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_6, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 379, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_6, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 378, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; @@ -13345,7 +13351,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED __pyx_t_3 = 0; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":378 + /* "kivyblocks/blocks.pyx":377 * if acttype == 'event': * return self.eventAction(widget, desc, *args) * if acttype == 'multiple': # <<<<<<<<<<<<<< @@ -13354,33 +13360,33 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED */ } - /* "kivyblocks/blocks.pyx":381 + /* "kivyblocks/blocks.pyx":380 * return self.multipleAction(widget, desc, *args) * * alert("actiontype(%s) invalid" % acttype,title='error') # <<<<<<<<<<<<<< * * def eventAction(self, widget:Widget, desc, *args): */ - __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_alert); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 381, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_alert); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 380, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_6 = __Pyx_PyString_FormatSafe(__pyx_kp_s_actiontype_s_invalid, __pyx_v_acttype); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 381, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyString_FormatSafe(__pyx_kp_s_actiontype_s_invalid, __pyx_v_acttype); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 380, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 381, __pyx_L1_error) + __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 380, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_6); __pyx_t_6 = 0; - __pyx_t_6 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 381, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 380, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_title, __pyx_n_s_error) < 0) __PYX_ERR(0, 381, __pyx_L1_error) - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_1, __pyx_t_6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 381, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_title, __pyx_n_s_error) < 0) __PYX_ERR(0, 380, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_1, __pyx_t_6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 380, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":359 + /* "kivyblocks/blocks.pyx":358 * w.open() * * def uniaction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< @@ -13406,7 +13412,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_32uniaction(CYTHON_UNUSED return __pyx_r; } -/* "kivyblocks/blocks.pyx":383 +/* "kivyblocks/blocks.pyx":382 * alert("actiontype(%s) invalid" % acttype,title='error') * * def eventAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< @@ -13463,18 +13469,18 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_35eventAction(PyObject *_ case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_widget)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("eventAction", 0, 3, 3, 1); __PYX_ERR(0, 383, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("eventAction", 0, 3, 3, 1); __PYX_ERR(0, 382, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: if (likely((values[2] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_desc)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("eventAction", 0, 3, 3, 2); __PYX_ERR(0, 383, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("eventAction", 0, 3, 3, 2); __PYX_ERR(0, 382, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { const Py_ssize_t used_pos_args = (pos_args < 3) ? pos_args : 3; - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, used_pos_args, "eventAction") < 0)) __PYX_ERR(0, 383, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, used_pos_args, "eventAction") < 0)) __PYX_ERR(0, 382, __pyx_L3_error) } } else if (PyTuple_GET_SIZE(__pyx_args) < 3) { goto __pyx_L5_argtuple_error; @@ -13489,7 +13495,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_35eventAction(PyObject *_ } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("eventAction", 0, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 383, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("eventAction", 0, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 382, __pyx_L3_error) __pyx_L3_error:; __Pyx_DECREF(__pyx_v_args); __pyx_v_args = 0; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.eventAction", __pyx_clineno, __pyx_lineno, __pyx_filename); @@ -13532,14 +13538,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS int __pyx_clineno = 0; __Pyx_RefNannySetupContext("eventAction", 0); - /* "kivyblocks/blocks.pyx":384 + /* "kivyblocks/blocks.pyx":383 * * def eventAction(self, widget:Widget, desc, *args): * target = self.get_target(widget, desc) # <<<<<<<<<<<<<< * event = desc.get('dispatch_event') * if not event: */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_get_target); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 384, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_get_target); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 383, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = NULL; __pyx_t_4 = 0; @@ -13556,7 +13562,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_2)) { PyObject *__pyx_temp[3] = {__pyx_t_3, __pyx_v_widget, __pyx_v_desc}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 384, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 383, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_1); } else @@ -13564,13 +13570,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_2)) { PyObject *__pyx_temp[3] = {__pyx_t_3, __pyx_v_widget, __pyx_v_desc}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 384, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 383, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_1); } else #endif { - __pyx_t_5 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 384, __pyx_L1_error) + __pyx_t_5 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 383, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); if (__pyx_t_3) { __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_3); __pyx_t_3 = NULL; @@ -13581,7 +13587,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS __Pyx_INCREF(__pyx_v_desc); __Pyx_GIVEREF(__pyx_v_desc); PyTuple_SET_ITEM(__pyx_t_5, 1+__pyx_t_4, __pyx_v_desc); - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_5, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 384, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_5, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 383, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; } @@ -13589,14 +13595,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS __pyx_v_target = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":385 + /* "kivyblocks/blocks.pyx":384 * def eventAction(self, widget:Widget, desc, *args): * target = self.get_target(widget, desc) * event = desc.get('dispatch_event') # <<<<<<<<<<<<<< * if not event: * Logger.info('Block: eventAction():desc(%s) miss dispatch_event', */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 385, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 384, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_5 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { @@ -13610,44 +13616,44 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS } __pyx_t_1 = (__pyx_t_5) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_5, __pyx_n_s_dispatch_event) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_n_s_dispatch_event); __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 385, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 384, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_v_event = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":386 + /* "kivyblocks/blocks.pyx":385 * target = self.get_target(widget, desc) * event = desc.get('dispatch_event') * if not event: # <<<<<<<<<<<<<< * Logger.info('Block: eventAction():desc(%s) miss dispatch_event', * str(desc)) */ - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_v_event); if (unlikely(__pyx_t_6 < 0)) __PYX_ERR(0, 386, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_v_event); if (unlikely(__pyx_t_6 < 0)) __PYX_ERR(0, 385, __pyx_L1_error) __pyx_t_7 = ((!__pyx_t_6) != 0); if (__pyx_t_7) { - /* "kivyblocks/blocks.pyx":387 + /* "kivyblocks/blocks.pyx":386 * event = desc.get('dispatch_event') * if not event: * Logger.info('Block: eventAction():desc(%s) miss dispatch_event', # <<<<<<<<<<<<<< * str(desc)) * return */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Logger); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 387, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Logger); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 386, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_info); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 387, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_info); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 386, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":388 + /* "kivyblocks/blocks.pyx":387 * if not event: * Logger.info('Block: eventAction():desc(%s) miss dispatch_event', * str(desc)) # <<<<<<<<<<<<<< * return * params = desc.get('params',{}) */ - __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyString_Type)), __pyx_v_desc); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 388, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyString_Type)), __pyx_v_desc); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 387, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = NULL; __pyx_t_4 = 0; @@ -13664,7 +13670,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_5)) { PyObject *__pyx_temp[3] = {__pyx_t_3, __pyx_kp_s_Block_eventAction_desc_s_miss_di, __pyx_t_2}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 387, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 386, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; @@ -13673,14 +13679,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) { PyObject *__pyx_temp[3] = {__pyx_t_3, __pyx_kp_s_Block_eventAction_desc_s_miss_di, __pyx_t_2}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 387, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 386, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } else #endif { - __pyx_t_8 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 387, __pyx_L1_error) + __pyx_t_8 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 386, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); if (__pyx_t_3) { __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_3); __pyx_t_3 = NULL; @@ -13691,14 +13697,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS __Pyx_GIVEREF(__pyx_t_2); PyTuple_SET_ITEM(__pyx_t_8, 1+__pyx_t_4, __pyx_t_2); __pyx_t_2 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_8, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 387, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_8, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 386, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; } __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":389 + /* "kivyblocks/blocks.pyx":388 * Logger.info('Block: eventAction():desc(%s) miss dispatch_event', * str(desc)) * return # <<<<<<<<<<<<<< @@ -13709,7 +13715,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "kivyblocks/blocks.pyx":386 + /* "kivyblocks/blocks.pyx":385 * target = self.get_target(widget, desc) * event = desc.get('dispatch_event') * if not event: # <<<<<<<<<<<<<< @@ -13718,16 +13724,16 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS */ } - /* "kivyblocks/blocks.pyx":390 + /* "kivyblocks/blocks.pyx":389 * str(desc)) * return * params = desc.get('params',{}) # <<<<<<<<<<<<<< * d = self.getActionData(widget,desc, *args) * if d: */ - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 390, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 389, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_8 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 390, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 389, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __pyx_t_2 = NULL; __pyx_t_4 = 0; @@ -13744,7 +13750,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_5)) { PyObject *__pyx_temp[3] = {__pyx_t_2, __pyx_n_s_params, __pyx_t_8}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 390, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 389, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; @@ -13753,14 +13759,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) { PyObject *__pyx_temp[3] = {__pyx_t_2, __pyx_n_s_params, __pyx_t_8}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 390, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 389, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; } else #endif { - __pyx_t_3 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 390, __pyx_L1_error) + __pyx_t_3 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 389, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); if (__pyx_t_2) { __Pyx_GIVEREF(__pyx_t_2); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); __pyx_t_2 = NULL; @@ -13771,7 +13777,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS __Pyx_GIVEREF(__pyx_t_8); PyTuple_SET_ITEM(__pyx_t_3, 1+__pyx_t_4, __pyx_t_8); __pyx_t_8 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 390, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 389, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } @@ -13779,16 +13785,16 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS __pyx_v_params = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":391 + /* "kivyblocks/blocks.pyx":390 * return * params = desc.get('params',{}) * d = self.getActionData(widget,desc, *args) # <<<<<<<<<<<<<< * if d: * params.update(d) */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_getActionData); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 391, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_getActionData); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 390, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 391, __pyx_L1_error) + __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 390, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_INCREF(__pyx_v_widget); __Pyx_GIVEREF(__pyx_v_widget); @@ -13796,34 +13802,34 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS __Pyx_INCREF(__pyx_v_desc); __Pyx_GIVEREF(__pyx_v_desc); PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_v_desc); - __pyx_t_3 = PyNumber_Add(__pyx_t_5, __pyx_v_args); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 391, __pyx_L1_error) + __pyx_t_3 = PyNumber_Add(__pyx_t_5, __pyx_v_args); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 390, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 391, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 390, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_v_d = __pyx_t_5; __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":392 + /* "kivyblocks/blocks.pyx":391 * params = desc.get('params',{}) * d = self.getActionData(widget,desc, *args) * if d: # <<<<<<<<<<<<<< * params.update(d) * try: */ - __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_v_d); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 392, __pyx_L1_error) + __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_v_d); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 391, __pyx_L1_error) if (__pyx_t_7) { - /* "kivyblocks/blocks.pyx":393 + /* "kivyblocks/blocks.pyx":392 * d = self.getActionData(widget,desc, *args) * if d: * params.update(d) # <<<<<<<<<<<<<< * try: * target.dispatch(event, params) */ - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_params, __pyx_n_s_update); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 393, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_params, __pyx_n_s_update); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 392, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_1 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_3))) { @@ -13837,12 +13843,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS } __pyx_t_5 = (__pyx_t_1) ? __Pyx_PyObject_Call2Args(__pyx_t_3, __pyx_t_1, __pyx_v_d) : __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_v_d); __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 393, __pyx_L1_error) + if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 392, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":392 + /* "kivyblocks/blocks.pyx":391 * params = desc.get('params',{}) * d = self.getActionData(widget,desc, *args) * if d: # <<<<<<<<<<<<<< @@ -13851,7 +13857,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS */ } - /* "kivyblocks/blocks.pyx":394 + /* "kivyblocks/blocks.pyx":393 * if d: * params.update(d) * try: # <<<<<<<<<<<<<< @@ -13867,14 +13873,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS __Pyx_XGOTREF(__pyx_t_11); /*try:*/ { - /* "kivyblocks/blocks.pyx":395 + /* "kivyblocks/blocks.pyx":394 * params.update(d) * try: * target.dispatch(event, params) # <<<<<<<<<<<<<< * except Exception as e: * Logger.info(f'Block: eventAction():dispatch {event} error') */ - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_target, __pyx_n_s_dispatch); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 395, __pyx_L5_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_target, __pyx_n_s_dispatch); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 394, __pyx_L5_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_1 = NULL; __pyx_t_4 = 0; @@ -13891,7 +13897,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_3)) { PyObject *__pyx_temp[3] = {__pyx_t_1, __pyx_v_event, __pyx_v_params}; - __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 395, __pyx_L5_error) + __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 394, __pyx_L5_error) __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_GOTREF(__pyx_t_5); } else @@ -13899,13 +13905,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_3)) { PyObject *__pyx_temp[3] = {__pyx_t_1, __pyx_v_event, __pyx_v_params}; - __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 395, __pyx_L5_error) + __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 394, __pyx_L5_error) __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_GOTREF(__pyx_t_5); } else #endif { - __pyx_t_8 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 395, __pyx_L5_error) + __pyx_t_8 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 394, __pyx_L5_error) __Pyx_GOTREF(__pyx_t_8); if (__pyx_t_1) { __Pyx_GIVEREF(__pyx_t_1); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_1); __pyx_t_1 = NULL; @@ -13916,14 +13922,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS __Pyx_INCREF(__pyx_v_params); __Pyx_GIVEREF(__pyx_v_params); PyTuple_SET_ITEM(__pyx_t_8, 1+__pyx_t_4, __pyx_v_params); - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_8, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 395, __pyx_L5_error) + __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_8, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 394, __pyx_L5_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; } __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":394 + /* "kivyblocks/blocks.pyx":393 * if d: * params.update(d) * try: # <<<<<<<<<<<<<< @@ -13942,7 +13948,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "kivyblocks/blocks.pyx":396 + /* "kivyblocks/blocks.pyx":395 * try: * target.dispatch(event, params) * except Exception as e: # <<<<<<<<<<<<<< @@ -13952,26 +13958,26 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS __pyx_t_4 = __Pyx_PyErr_ExceptionMatches(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); if (__pyx_t_4) { __Pyx_AddTraceback("kivyblocks.blocks.Blocks.eventAction", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_3, &__pyx_t_8) < 0) __PYX_ERR(0, 396, __pyx_L7_except_error) + if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_3, &__pyx_t_8) < 0) __PYX_ERR(0, 395, __pyx_L7_except_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_GOTREF(__pyx_t_3); __Pyx_GOTREF(__pyx_t_8); __Pyx_INCREF(__pyx_t_3); __pyx_v_e = __pyx_t_3; - /* "kivyblocks/blocks.pyx":397 + /* "kivyblocks/blocks.pyx":396 * target.dispatch(event, params) * except Exception as e: * Logger.info(f'Block: eventAction():dispatch {event} error') # <<<<<<<<<<<<<< * print_exc() * return */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Logger); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 397, __pyx_L7_except_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Logger); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 396, __pyx_L7_except_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_12 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_info); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 397, __pyx_L7_except_error) + __pyx_t_12 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_info); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 396, __pyx_L7_except_error) __Pyx_GOTREF(__pyx_t_12); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyTuple_New(3); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 397, __pyx_L7_except_error) + __pyx_t_2 = PyTuple_New(3); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 396, __pyx_L7_except_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_13 = 0; __pyx_t_14 = 127; @@ -13979,7 +13985,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS __pyx_t_13 += 30; __Pyx_GIVEREF(__pyx_kp_u_Block_eventAction_dispatch); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_u_Block_eventAction_dispatch); - __pyx_t_15 = __Pyx_PyObject_FormatSimple(__pyx_v_event, __pyx_empty_unicode); if (unlikely(!__pyx_t_15)) __PYX_ERR(0, 397, __pyx_L7_except_error) + __pyx_t_15 = __Pyx_PyObject_FormatSimple(__pyx_v_event, __pyx_empty_unicode); if (unlikely(!__pyx_t_15)) __PYX_ERR(0, 396, __pyx_L7_except_error) __Pyx_GOTREF(__pyx_t_15); __pyx_t_14 = (__Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_15) > __pyx_t_14) ? __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_15) : __pyx_t_14; __pyx_t_13 += __Pyx_PyUnicode_GET_LENGTH(__pyx_t_15); @@ -13990,7 +13996,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS __pyx_t_13 += 6; __Pyx_GIVEREF(__pyx_kp_u_error_2); PyTuple_SET_ITEM(__pyx_t_2, 2, __pyx_kp_u_error_2); - __pyx_t_15 = __Pyx_PyUnicode_Join(__pyx_t_2, 3, __pyx_t_13, __pyx_t_14); if (unlikely(!__pyx_t_15)) __PYX_ERR(0, 397, __pyx_L7_except_error) + __pyx_t_15 = __Pyx_PyUnicode_Join(__pyx_t_2, 3, __pyx_t_13, __pyx_t_14); if (unlikely(!__pyx_t_15)) __PYX_ERR(0, 396, __pyx_L7_except_error) __Pyx_GOTREF(__pyx_t_15); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_t_2 = NULL; @@ -14006,19 +14012,19 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS __pyx_t_1 = (__pyx_t_2) ? __Pyx_PyObject_Call2Args(__pyx_t_12, __pyx_t_2, __pyx_t_15) : __Pyx_PyObject_CallOneArg(__pyx_t_12, __pyx_t_15); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 397, __pyx_L7_except_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 396, __pyx_L7_except_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":398 + /* "kivyblocks/blocks.pyx":397 * except Exception as e: * Logger.info(f'Block: eventAction():dispatch {event} error') * print_exc() # <<<<<<<<<<<<<< * return * */ - __Pyx_GetModuleGlobalName(__pyx_t_12, __pyx_n_s_print_exc); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 398, __pyx_L7_except_error) + __Pyx_GetModuleGlobalName(__pyx_t_12, __pyx_n_s_print_exc); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 397, __pyx_L7_except_error) __Pyx_GOTREF(__pyx_t_12); __pyx_t_15 = NULL; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_12))) { @@ -14032,12 +14038,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS } __pyx_t_1 = (__pyx_t_15) ? __Pyx_PyObject_CallOneArg(__pyx_t_12, __pyx_t_15) : __Pyx_PyObject_CallNoArg(__pyx_t_12); __Pyx_XDECREF(__pyx_t_15); __pyx_t_15 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 398, __pyx_L7_except_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 397, __pyx_L7_except_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":399 + /* "kivyblocks/blocks.pyx":398 * Logger.info(f'Block: eventAction():dispatch {event} error') * print_exc() * return # <<<<<<<<<<<<<< @@ -14054,7 +14060,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS goto __pyx_L7_except_error; __pyx_L7_except_error:; - /* "kivyblocks/blocks.pyx":394 + /* "kivyblocks/blocks.pyx":393 * if d: * params.update(d) * try: # <<<<<<<<<<<<<< @@ -14075,7 +14081,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS __pyx_L10_try_end:; } - /* "kivyblocks/blocks.pyx":383 + /* "kivyblocks/blocks.pyx":382 * alert("actiontype(%s) invalid" % acttype,title='error') * * def eventAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< @@ -14107,7 +14113,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_34eventAction(CYTHON_UNUS return __pyx_r; } -/* "kivyblocks/blocks.pyx":401 +/* "kivyblocks/blocks.pyx":400 * return * * def get_target(self, widget:Widget, desc): # <<<<<<<<<<<<<< @@ -14153,17 +14159,17 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_37get_target(PyObject *__ case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_widget)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("get_target", 1, 3, 3, 1); __PYX_ERR(0, 401, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("get_target", 1, 3, 3, 1); __PYX_ERR(0, 400, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: if (likely((values[2] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_desc)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("get_target", 1, 3, 3, 2); __PYX_ERR(0, 401, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("get_target", 1, 3, 3, 2); __PYX_ERR(0, 400, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "get_target") < 0)) __PYX_ERR(0, 401, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "get_target") < 0)) __PYX_ERR(0, 400, __pyx_L3_error) } } else if (PyTuple_GET_SIZE(__pyx_args) != 3) { goto __pyx_L5_argtuple_error; @@ -14178,7 +14184,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_37get_target(PyObject *__ } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("get_target", 1, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 401, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("get_target", 1, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 400, __pyx_L3_error) __pyx_L3_error:; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.get_target", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); @@ -14205,14 +14211,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_36get_target(CYTHON_UNUSE int __pyx_clineno = 0; __Pyx_RefNannySetupContext("get_target", 0); - /* "kivyblocks/blocks.pyx":402 + /* "kivyblocks/blocks.pyx":401 * * def get_target(self, widget:Widget, desc): * if not desc.get('target'): # <<<<<<<<<<<<<< * return None * return Blocks.getWidgetById(desc.get('target'),from_widget=widget) */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 402, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 401, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { @@ -14226,15 +14232,15 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_36get_target(CYTHON_UNUSE } __pyx_t_1 = (__pyx_t_3) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_3, __pyx_n_s_target) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_n_s_target); __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 402, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 401, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 402, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 401, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_t_5 = ((!__pyx_t_4) != 0); if (__pyx_t_5) { - /* "kivyblocks/blocks.pyx":403 + /* "kivyblocks/blocks.pyx":402 * def get_target(self, widget:Widget, desc): * if not desc.get('target'): * return None # <<<<<<<<<<<<<< @@ -14245,7 +14251,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_36get_target(CYTHON_UNUSE __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "kivyblocks/blocks.pyx":402 + /* "kivyblocks/blocks.pyx":401 * * def get_target(self, widget:Widget, desc): * if not desc.get('target'): # <<<<<<<<<<<<<< @@ -14254,7 +14260,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_36get_target(CYTHON_UNUSE */ } - /* "kivyblocks/blocks.pyx":404 + /* "kivyblocks/blocks.pyx":403 * if not desc.get('target'): * return None * return Blocks.getWidgetById(desc.get('target'),from_widget=widget) # <<<<<<<<<<<<<< @@ -14262,12 +14268,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_36get_target(CYTHON_UNUSE * def blocksAction(self, widget:Widget, desc, *args): */ __Pyx_XDECREF(__pyx_r); - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_Blocks); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 404, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_Blocks); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 403, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_getWidgetById); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 404, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_getWidgetById); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 403, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 404, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 403, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_6 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_3))) { @@ -14281,18 +14287,18 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_36get_target(CYTHON_UNUSE } __pyx_t_1 = (__pyx_t_6) ? __Pyx_PyObject_Call2Args(__pyx_t_3, __pyx_t_6, __pyx_n_s_target) : __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_n_s_target); __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 404, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 403, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 404, __pyx_L1_error) + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 403, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_GIVEREF(__pyx_t_1); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 404, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 403, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_from_widget, __pyx_v_widget) < 0) __PYX_ERR(0, 404, __pyx_L1_error) - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 404, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_from_widget, __pyx_v_widget) < 0) __PYX_ERR(0, 403, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 403, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -14301,7 +14307,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_36get_target(CYTHON_UNUSE __pyx_t_6 = 0; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":401 + /* "kivyblocks/blocks.pyx":400 * return * * def get_target(self, widget:Widget, desc): # <<<<<<<<<<<<<< @@ -14323,7 +14329,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_36get_target(CYTHON_UNUSE return __pyx_r; } -/* "kivyblocks/blocks.pyx":406 +/* "kivyblocks/blocks.pyx":405 * return Blocks.getWidgetById(desc.get('target'),from_widget=widget) * * def blocksAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< @@ -14380,18 +14386,18 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_39blocksAction(PyObject * case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_widget)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("blocksAction", 0, 3, 3, 1); __PYX_ERR(0, 406, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("blocksAction", 0, 3, 3, 1); __PYX_ERR(0, 405, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: if (likely((values[2] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_desc)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("blocksAction", 0, 3, 3, 2); __PYX_ERR(0, 406, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("blocksAction", 0, 3, 3, 2); __PYX_ERR(0, 405, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { const Py_ssize_t used_pos_args = (pos_args < 3) ? pos_args : 3; - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, used_pos_args, "blocksAction") < 0)) __PYX_ERR(0, 406, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, used_pos_args, "blocksAction") < 0)) __PYX_ERR(0, 405, __pyx_L3_error) } } else if (PyTuple_GET_SIZE(__pyx_args) < 3) { goto __pyx_L5_argtuple_error; @@ -14406,7 +14412,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_39blocksAction(PyObject * } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("blocksAction", 0, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 406, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("blocksAction", 0, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 405, __pyx_L3_error) __pyx_L3_error:; __Pyx_DECREF(__pyx_v_args); __pyx_v_args = 0; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.blocksAction", __pyx_clineno, __pyx_lineno, __pyx_filename); @@ -14421,12 +14427,12 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_39blocksAction(PyObject * return __pyx_r; } -/* "kivyblocks/blocks.pyx":415 +/* "kivyblocks/blocks.pyx":414 * p.update(d) * opts['options'] = p * def doit(target:Widget, add_mode:str, o, w:Widget): # <<<<<<<<<<<<<< - * if target: - * if add_mode == 'replace': + * if isinstance(w, ModalView): + * return */ /* Python wrapper */ @@ -14470,23 +14476,23 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_12blocksAction_1doit(PyOb case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_add_mode)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("doit", 1, 4, 4, 1); __PYX_ERR(0, 415, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("doit", 1, 4, 4, 1); __PYX_ERR(0, 414, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: if (likely((values[2] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_o)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("doit", 1, 4, 4, 2); __PYX_ERR(0, 415, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("doit", 1, 4, 4, 2); __PYX_ERR(0, 414, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 3: if (likely((values[3] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_w)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("doit", 1, 4, 4, 3); __PYX_ERR(0, 415, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("doit", 1, 4, 4, 3); __PYX_ERR(0, 414, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "doit") < 0)) __PYX_ERR(0, 415, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "doit") < 0)) __PYX_ERR(0, 414, __pyx_L3_error) } } else if (PyTuple_GET_SIZE(__pyx_args) != 4) { goto __pyx_L5_argtuple_error; @@ -14503,13 +14509,13 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_12blocksAction_1doit(PyOb } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("doit", 1, 4, 4, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 415, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("doit", 1, 4, 4, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 414, __pyx_L3_error) __pyx_L3_error:; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.blocksAction.doit", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); return NULL; __pyx_L4_argument_unpacking_done:; - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_add_mode), (&PyString_Type), 1, "add_mode", 1))) __PYX_ERR(0, 415, __pyx_L1_error) + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_add_mode), (&PyString_Type), 1, "add_mode", 1))) __PYX_ERR(0, 414, __pyx_L1_error) __pyx_r = __pyx_pf_10kivyblocks_6blocks_6Blocks_12blocksAction_doit(__pyx_self, __pyx_v_target, __pyx_v_add_mode, __pyx_v_o, __pyx_v_w); /* function exit code */ @@ -14524,9 +14530,9 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_12blocksAction_1doit(PyOb static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12blocksAction_doit(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_target, PyObject *__pyx_v_add_mode, CYTHON_UNUSED PyObject *__pyx_v_o, PyObject *__pyx_v_w) { PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations - int __pyx_t_1; + PyObject *__pyx_t_1 = NULL; int __pyx_t_2; - PyObject *__pyx_t_3 = NULL; + int __pyx_t_3; PyObject *__pyx_t_4 = NULL; PyObject *__pyx_t_5 = NULL; int __pyx_lineno = 0; @@ -14534,35 +14540,69 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12blocksAction_doit(CYTHO int __pyx_clineno = 0; __Pyx_RefNannySetupContext("doit", 0); - /* "kivyblocks/blocks.pyx":416 + /* "kivyblocks/blocks.pyx":415 * opts['options'] = p * def doit(target:Widget, add_mode:str, o, w:Widget): + * if isinstance(w, ModalView): # <<<<<<<<<<<<<< + * return + * + */ + __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_ModalView); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 415, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + __pyx_t_2 = PyObject_IsInstance(__pyx_v_w, __pyx_t_1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 415, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_3 = (__pyx_t_2 != 0); + if (__pyx_t_3) { + + /* "kivyblocks/blocks.pyx":416 + * def doit(target:Widget, add_mode:str, o, w:Widget): + * if isinstance(w, ModalView): + * return # <<<<<<<<<<<<<< + * + * if target: + */ + __Pyx_XDECREF(__pyx_r); + __pyx_r = Py_None; __Pyx_INCREF(Py_None); + goto __pyx_L0; + + /* "kivyblocks/blocks.pyx":415 + * opts['options'] = p + * def doit(target:Widget, add_mode:str, o, w:Widget): + * if isinstance(w, ModalView): # <<<<<<<<<<<<<< + * return + * + */ + } + + /* "kivyblocks/blocks.pyx":418 + * return + * * if target: # <<<<<<<<<<<<<< * if add_mode == 'replace': * target.clear_widgets() */ - __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_v_target); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 416, __pyx_L1_error) - if (__pyx_t_1) { + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_target); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 418, __pyx_L1_error) + if (__pyx_t_3) { - /* "kivyblocks/blocks.pyx":417 - * def doit(target:Widget, add_mode:str, o, w:Widget): + /* "kivyblocks/blocks.pyx":419 + * * if target: * if add_mode == 'replace': # <<<<<<<<<<<<<< * target.clear_widgets() * target.add_widget(w) */ - __pyx_t_1 = (__Pyx_PyString_Equals(__pyx_v_add_mode, __pyx_n_s_replace, Py_EQ)); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 417, __pyx_L1_error) - __pyx_t_2 = (__pyx_t_1 != 0); + __pyx_t_3 = (__Pyx_PyString_Equals(__pyx_v_add_mode, __pyx_n_s_replace, Py_EQ)); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 419, __pyx_L1_error) + __pyx_t_2 = (__pyx_t_3 != 0); if (__pyx_t_2) { - /* "kivyblocks/blocks.pyx":418 + /* "kivyblocks/blocks.pyx":420 * if target: * if add_mode == 'replace': * target.clear_widgets() # <<<<<<<<<<<<<< * target.add_widget(w) * */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_target, __pyx_n_s_clear_widgets); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 418, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_target, __pyx_n_s_clear_widgets); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 420, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __pyx_t_5 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_4))) { @@ -14574,15 +14614,15 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12blocksAction_doit(CYTHO __Pyx_DECREF_SET(__pyx_t_4, function); } } - __pyx_t_3 = (__pyx_t_5) ? __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_5) : __Pyx_PyObject_CallNoArg(__pyx_t_4); + __pyx_t_1 = (__pyx_t_5) ? __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_5) : __Pyx_PyObject_CallNoArg(__pyx_t_4); __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 418, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_3); + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 420, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":417 - * def doit(target:Widget, add_mode:str, o, w:Widget): + /* "kivyblocks/blocks.pyx":419 + * * if target: * if add_mode == 'replace': # <<<<<<<<<<<<<< * target.clear_widgets() @@ -14590,14 +14630,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12blocksAction_doit(CYTHO */ } - /* "kivyblocks/blocks.pyx":419 + /* "kivyblocks/blocks.pyx":421 * if add_mode == 'replace': * target.clear_widgets() * target.add_widget(w) # <<<<<<<<<<<<<< * * def doerr(o,e): */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_target, __pyx_n_s_add_widget); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 419, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_target, __pyx_n_s_add_widget); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 421, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __pyx_t_5 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_4))) { @@ -14609,35 +14649,35 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12blocksAction_doit(CYTHO __Pyx_DECREF_SET(__pyx_t_4, function); } } - __pyx_t_3 = (__pyx_t_5) ? __Pyx_PyObject_Call2Args(__pyx_t_4, __pyx_t_5, __pyx_v_w) : __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_v_w); + __pyx_t_1 = (__pyx_t_5) ? __Pyx_PyObject_Call2Args(__pyx_t_4, __pyx_t_5, __pyx_v_w) : __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_v_w); __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 419, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_3); + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 421, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":416 - * opts['options'] = p - * def doit(target:Widget, add_mode:str, o, w:Widget): + /* "kivyblocks/blocks.pyx":418 + * return + * * if target: # <<<<<<<<<<<<<< * if add_mode == 'replace': * target.clear_widgets() */ } - /* "kivyblocks/blocks.pyx":415 + /* "kivyblocks/blocks.pyx":414 * p.update(d) * opts['options'] = p * def doit(target:Widget, add_mode:str, o, w:Widget): # <<<<<<<<<<<<<< - * if target: - * if add_mode == 'replace': + * if isinstance(w, ModalView): + * return */ /* function exit code */ __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; __pyx_L1_error:; - __Pyx_XDECREF(__pyx_t_3); + __Pyx_XDECREF(__pyx_t_1); __Pyx_XDECREF(__pyx_t_4); __Pyx_XDECREF(__pyx_t_5); __Pyx_AddTraceback("kivyblocks.blocks.Blocks.blocksAction.doit", __pyx_clineno, __pyx_lineno, __pyx_filename); @@ -14648,7 +14688,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12blocksAction_doit(CYTHO return __pyx_r; } -/* "kivyblocks/blocks.pyx":421 +/* "kivyblocks/blocks.pyx":423 * target.add_widget(w) * * def doerr(o,e): # <<<<<<<<<<<<<< @@ -14691,11 +14731,11 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_12blocksAction_3doerr(PyO case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_e)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("doerr", 1, 2, 2, 1); __PYX_ERR(0, 421, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("doerr", 1, 2, 2, 1); __PYX_ERR(0, 423, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "doerr") < 0)) __PYX_ERR(0, 421, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "doerr") < 0)) __PYX_ERR(0, 423, __pyx_L3_error) } } else if (PyTuple_GET_SIZE(__pyx_args) != 2) { goto __pyx_L5_argtuple_error; @@ -14708,7 +14748,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_12blocksAction_3doerr(PyO } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("doerr", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 421, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("doerr", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 423, __pyx_L3_error) __pyx_L3_error:; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.blocksAction.doerr", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); @@ -14739,28 +14779,28 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12blocksAction_2doerr(PyO __pyx_outer_scope = (struct __pyx_obj_10kivyblocks_6blocks___pyx_scope_struct__blocksAction *) __Pyx_CyFunction_GetClosure(__pyx_self); __pyx_cur_scope = __pyx_outer_scope; - /* "kivyblocks/blocks.pyx":422 + /* "kivyblocks/blocks.pyx":424 * * def doerr(o,e): * Logger.info('Block: blocksAction(): desc=%s widgetBuild error' # <<<<<<<<<<<<<< * ,str(desc)) * raise e */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Logger); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 422, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Logger); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 424, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_info); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 422, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_info); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 424, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":423 + /* "kivyblocks/blocks.pyx":425 * def doerr(o,e): * Logger.info('Block: blocksAction(): desc=%s widgetBuild error' * ,str(desc)) # <<<<<<<<<<<<<< * raise e * */ - if (unlikely(!__pyx_cur_scope->__pyx_v_desc)) { __Pyx_RaiseClosureNameError("desc"); __PYX_ERR(0, 423, __pyx_L1_error) } - __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyString_Type)), __pyx_cur_scope->__pyx_v_desc); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 423, __pyx_L1_error) + if (unlikely(!__pyx_cur_scope->__pyx_v_desc)) { __Pyx_RaiseClosureNameError("desc"); __PYX_ERR(0, 425, __pyx_L1_error) } + __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyString_Type)), __pyx_cur_scope->__pyx_v_desc); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 425, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_4 = NULL; __pyx_t_5 = 0; @@ -14777,7 +14817,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12blocksAction_2doerr(PyO #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_3)) { PyObject *__pyx_temp[3] = {__pyx_t_4, __pyx_kp_s_Block_blocksAction_desc_s_widget, __pyx_t_2}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 422, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 424, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; @@ -14786,14 +14826,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12blocksAction_2doerr(PyO #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_3)) { PyObject *__pyx_temp[3] = {__pyx_t_4, __pyx_kp_s_Block_blocksAction_desc_s_widget, __pyx_t_2}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 422, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 424, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } else #endif { - __pyx_t_6 = PyTuple_New(2+__pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 422, __pyx_L1_error) + __pyx_t_6 = PyTuple_New(2+__pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 424, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); if (__pyx_t_4) { __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_4); __pyx_t_4 = NULL; @@ -14804,14 +14844,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12blocksAction_2doerr(PyO __Pyx_GIVEREF(__pyx_t_2); PyTuple_SET_ITEM(__pyx_t_6, 1+__pyx_t_5, __pyx_t_2); __pyx_t_2 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 422, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 424, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; } __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":424 + /* "kivyblocks/blocks.pyx":426 * Logger.info('Block: blocksAction(): desc=%s widgetBuild error' * ,str(desc)) * raise e # <<<<<<<<<<<<<< @@ -14819,9 +14859,9 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12blocksAction_2doerr(PyO * b = Blocks() */ __Pyx_Raise(__pyx_v_e, 0, 0, 0); - __PYX_ERR(0, 424, __pyx_L1_error) + __PYX_ERR(0, 426, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":421 + /* "kivyblocks/blocks.pyx":423 * target.add_widget(w) * * def doerr(o,e): # <<<<<<<<<<<<<< @@ -14843,7 +14883,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_12blocksAction_2doerr(PyO return __pyx_r; } -/* "kivyblocks/blocks.pyx":406 +/* "kivyblocks/blocks.pyx":405 * return Blocks.getWidgetById(desc.get('target'),from_widget=widget) * * def blocksAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< @@ -14879,7 +14919,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_38blocksAction(CYTHON_UNU if (unlikely(!__pyx_cur_scope)) { __pyx_cur_scope = ((struct __pyx_obj_10kivyblocks_6blocks___pyx_scope_struct__blocksAction *)Py_None); __Pyx_INCREF(Py_None); - __PYX_ERR(0, 406, __pyx_L1_error) + __PYX_ERR(0, 405, __pyx_L1_error) } else { __Pyx_GOTREF(__pyx_cur_scope); } @@ -14887,14 +14927,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_38blocksAction(CYTHON_UNU __Pyx_INCREF(__pyx_cur_scope->__pyx_v_desc); __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_desc); - /* "kivyblocks/blocks.pyx":407 + /* "kivyblocks/blocks.pyx":406 * * def blocksAction(self, widget:Widget, desc, *args): * target = self.get_target(widget, desc) # <<<<<<<<<<<<<< * add_mode = desc.get('mode','replace') * opts = desc.get('options').copy() */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_get_target); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 407, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_get_target); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 406, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = NULL; __pyx_t_4 = 0; @@ -14911,7 +14951,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_38blocksAction(CYTHON_UNU #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_2)) { PyObject *__pyx_temp[3] = {__pyx_t_3, __pyx_v_widget, __pyx_cur_scope->__pyx_v_desc}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 407, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 406, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_1); } else @@ -14919,13 +14959,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_38blocksAction(CYTHON_UNU #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_2)) { PyObject *__pyx_temp[3] = {__pyx_t_3, __pyx_v_widget, __pyx_cur_scope->__pyx_v_desc}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 407, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 406, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_1); } else #endif { - __pyx_t_5 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 407, __pyx_L1_error) + __pyx_t_5 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 406, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); if (__pyx_t_3) { __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_3); __pyx_t_3 = NULL; @@ -14936,7 +14976,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_38blocksAction(CYTHON_UNU __Pyx_INCREF(__pyx_cur_scope->__pyx_v_desc); __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_desc); PyTuple_SET_ITEM(__pyx_t_5, 1+__pyx_t_4, __pyx_cur_scope->__pyx_v_desc); - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_5, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 407, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_5, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 406, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; } @@ -14944,29 +14984,29 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_38blocksAction(CYTHON_UNU __pyx_v_target = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":408 + /* "kivyblocks/blocks.pyx":407 * def blocksAction(self, widget:Widget, desc, *args): * target = self.get_target(widget, desc) * add_mode = desc.get('mode','replace') # <<<<<<<<<<<<<< * opts = desc.get('options').copy() * d = self.getActionData(widget,desc, *args) */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 408, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 407, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_tuple__10, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 408, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_tuple__10, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 407, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_add_mode = __pyx_t_2; __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":409 + /* "kivyblocks/blocks.pyx":408 * target = self.get_target(widget, desc) * add_mode = desc.get('mode','replace') * opts = desc.get('options').copy() # <<<<<<<<<<<<<< * d = self.getActionData(widget,desc, *args) * p = opts.get('options',{}).copy() */ - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 409, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 408, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __pyx_t_3 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_5))) { @@ -14980,10 +15020,10 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_38blocksAction(CYTHON_UNU } __pyx_t_1 = (__pyx_t_3) ? __Pyx_PyObject_Call2Args(__pyx_t_5, __pyx_t_3, __pyx_n_s_options) : __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_n_s_options); __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 409, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 408, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_copy); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 409, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_copy); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 408, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_t_1 = NULL; @@ -14998,22 +15038,22 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_38blocksAction(CYTHON_UNU } __pyx_t_2 = (__pyx_t_1) ? __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_1) : __Pyx_PyObject_CallNoArg(__pyx_t_5); __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 409, __pyx_L1_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 408, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_v_opts = __pyx_t_2; __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":410 + /* "kivyblocks/blocks.pyx":409 * add_mode = desc.get('mode','replace') * opts = desc.get('options').copy() * d = self.getActionData(widget,desc, *args) # <<<<<<<<<<<<<< * p = opts.get('options',{}).copy() * if d: */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_getActionData); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 410, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_getActionData); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 409, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 410, __pyx_L1_error) + __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 409, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_INCREF(__pyx_v_widget); __Pyx_GIVEREF(__pyx_v_widget); @@ -15021,26 +15061,26 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_38blocksAction(CYTHON_UNU __Pyx_INCREF(__pyx_cur_scope->__pyx_v_desc); __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_desc); PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_cur_scope->__pyx_v_desc); - __pyx_t_1 = PyNumber_Add(__pyx_t_5, __pyx_v_args); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 410, __pyx_L1_error) + __pyx_t_1 = PyNumber_Add(__pyx_t_5, __pyx_v_args); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 409, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_1, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 410, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_1, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 409, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_d = __pyx_t_5; __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":411 + /* "kivyblocks/blocks.pyx":410 * opts = desc.get('options').copy() * d = self.getActionData(widget,desc, *args) * p = opts.get('options',{}).copy() # <<<<<<<<<<<<<< * if d: * p.update(d) */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_opts, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 411, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_opts, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 410, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 411, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 410, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_6 = NULL; __pyx_t_4 = 0; @@ -15057,7 +15097,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_38blocksAction(CYTHON_UNU #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_2)) { PyObject *__pyx_temp[3] = {__pyx_t_6, __pyx_n_s_options, __pyx_t_3}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 411, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 410, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -15066,14 +15106,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_38blocksAction(CYTHON_UNU #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_2)) { PyObject *__pyx_temp[3] = {__pyx_t_6, __pyx_n_s_options, __pyx_t_3}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 411, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 410, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } else #endif { - __pyx_t_7 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 411, __pyx_L1_error) + __pyx_t_7 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 410, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); if (__pyx_t_6) { __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_6); __pyx_t_6 = NULL; @@ -15084,12 +15124,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_38blocksAction(CYTHON_UNU __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_7, 1+__pyx_t_4, __pyx_t_3); __pyx_t_3 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_7, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 411, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_7, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 410, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; } __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_copy); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 411, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_copy); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 410, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_t_1 = NULL; @@ -15104,30 +15144,30 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_38blocksAction(CYTHON_UNU } __pyx_t_5 = (__pyx_t_1) ? __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_t_1) : __Pyx_PyObject_CallNoArg(__pyx_t_2); __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 411, __pyx_L1_error) + if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 410, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_v_p = __pyx_t_5; __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":412 + /* "kivyblocks/blocks.pyx":411 * d = self.getActionData(widget,desc, *args) * p = opts.get('options',{}).copy() * if d: # <<<<<<<<<<<<<< * p.update(d) * opts['options'] = p */ - __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_v_d); if (unlikely(__pyx_t_8 < 0)) __PYX_ERR(0, 412, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_v_d); if (unlikely(__pyx_t_8 < 0)) __PYX_ERR(0, 411, __pyx_L1_error) if (__pyx_t_8) { - /* "kivyblocks/blocks.pyx":413 + /* "kivyblocks/blocks.pyx":412 * p = opts.get('options',{}).copy() * if d: * p.update(d) # <<<<<<<<<<<<<< * opts['options'] = p * def doit(target:Widget, add_mode:str, o, w:Widget): */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_p, __pyx_n_s_update); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 413, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_p, __pyx_n_s_update); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 412, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_1 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { @@ -15141,12 +15181,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_38blocksAction(CYTHON_UNU } __pyx_t_5 = (__pyx_t_1) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_1, __pyx_v_d) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_v_d); __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 413, __pyx_L1_error) + if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 412, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":412 + /* "kivyblocks/blocks.pyx":411 * d = self.getActionData(widget,desc, *args) * p = opts.get('options',{}).copy() * if d: # <<<<<<<<<<<<<< @@ -15155,60 +15195,60 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_38blocksAction(CYTHON_UNU */ } - /* "kivyblocks/blocks.pyx":414 + /* "kivyblocks/blocks.pyx":413 * if d: * p.update(d) * opts['options'] = p # <<<<<<<<<<<<<< * def doit(target:Widget, add_mode:str, o, w:Widget): - * if target: + * if isinstance(w, ModalView): */ - if (unlikely(PyObject_SetItem(__pyx_v_opts, __pyx_n_s_options, __pyx_v_p) < 0)) __PYX_ERR(0, 414, __pyx_L1_error) + if (unlikely(PyObject_SetItem(__pyx_v_opts, __pyx_n_s_options, __pyx_v_p) < 0)) __PYX_ERR(0, 413, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":415 + /* "kivyblocks/blocks.pyx":414 * p.update(d) * opts['options'] = p * def doit(target:Widget, add_mode:str, o, w:Widget): # <<<<<<<<<<<<<< - * if target: - * if add_mode == 'replace': + * if isinstance(w, ModalView): + * return */ - __pyx_t_5 = __Pyx_PyDict_NewPresized(3); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 415, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyDict_NewPresized(3); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 414, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Widget); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 415, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Widget); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 414, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_target, __pyx_t_2) < 0) __PYX_ERR(0, 415, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_target, __pyx_t_2) < 0) __PYX_ERR(0, 414, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_add_mode, __pyx_n_u_str_2) < 0) __PYX_ERR(0, 415, __pyx_L1_error) - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Widget); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 415, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_add_mode, __pyx_n_u_str_2) < 0) __PYX_ERR(0, 414, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Widget); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 414, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_w, __pyx_t_2) < 0) __PYX_ERR(0, 415, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_w, __pyx_t_2) < 0) __PYX_ERR(0, 414, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_12blocksAction_1doit, 0, __pyx_n_s_Blocks_blocksAction_locals_doit, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__12)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 415, __pyx_L1_error) + __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_12blocksAction_1doit, 0, __pyx_n_s_Blocks_blocksAction_locals_doit, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__12)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 414, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_CyFunction_SetAnnotationsDict(__pyx_t_2, __pyx_t_5); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_v_doit = __pyx_t_2; __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":421 + /* "kivyblocks/blocks.pyx":423 * target.add_widget(w) * * def doerr(o,e): # <<<<<<<<<<<<<< * Logger.info('Block: blocksAction(): desc=%s widgetBuild error' * ,str(desc)) */ - __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_12blocksAction_3doerr, 0, __pyx_n_s_Blocks_blocksAction_locals_doerr, ((PyObject*)__pyx_cur_scope), __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__14)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 421, __pyx_L1_error) + __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_12blocksAction_3doerr, 0, __pyx_n_s_Blocks_blocksAction_locals_doerr, ((PyObject*)__pyx_cur_scope), __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__14)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 423, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_v_doerr = __pyx_t_2; __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":426 + /* "kivyblocks/blocks.pyx":428 * raise e * * b = Blocks() # <<<<<<<<<<<<<< * b.bind(on_built=partial(doit,target,add_mode)) * b.bind(on_failed=doerr) */ - __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_Blocks); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 426, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_Blocks); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 428, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __pyx_t_1 = NULL; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_5))) { @@ -15222,24 +15262,24 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_38blocksAction(CYTHON_UNU } __pyx_t_2 = (__pyx_t_1) ? __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_1) : __Pyx_PyObject_CallNoArg(__pyx_t_5); __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 426, __pyx_L1_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 428, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_v_b = __pyx_t_2; __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":427 + /* "kivyblocks/blocks.pyx":429 * * b = Blocks() * b.bind(on_built=partial(doit,target,add_mode)) # <<<<<<<<<<<<<< * b.bind(on_failed=doerr) * b.widgetBuild(opts) */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_b, __pyx_n_s_bind); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 427, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_b, __pyx_n_s_bind); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 429, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 427, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 429, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_n_s_partial); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 427, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_n_s_partial); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 429, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __pyx_t_3 = NULL; __pyx_t_4 = 0; @@ -15256,7 +15296,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_38blocksAction(CYTHON_UNU #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_7)) { PyObject *__pyx_temp[4] = {__pyx_t_3, __pyx_v_doit, __pyx_v_target, __pyx_v_add_mode}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_7, __pyx_temp+1-__pyx_t_4, 3+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 427, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_7, __pyx_temp+1-__pyx_t_4, 3+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 429, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_1); } else @@ -15264,13 +15304,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_38blocksAction(CYTHON_UNU #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_7)) { PyObject *__pyx_temp[4] = {__pyx_t_3, __pyx_v_doit, __pyx_v_target, __pyx_v_add_mode}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_7, __pyx_temp+1-__pyx_t_4, 3+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 427, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_7, __pyx_temp+1-__pyx_t_4, 3+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 429, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_1); } else #endif { - __pyx_t_6 = PyTuple_New(3+__pyx_t_4); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 427, __pyx_L1_error) + __pyx_t_6 = PyTuple_New(3+__pyx_t_4); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 429, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); if (__pyx_t_3) { __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_3); __pyx_t_3 = NULL; @@ -15284,45 +15324,45 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_38blocksAction(CYTHON_UNU __Pyx_INCREF(__pyx_v_add_mode); __Pyx_GIVEREF(__pyx_v_add_mode); PyTuple_SET_ITEM(__pyx_t_6, 2+__pyx_t_4, __pyx_v_add_mode); - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_6, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 427, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_6, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 429, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; } __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_on_built, __pyx_t_1) < 0) __PYX_ERR(0, 427, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_on_built, __pyx_t_1) < 0) __PYX_ERR(0, 429, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_empty_tuple, __pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 427, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_empty_tuple, __pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 429, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":428 + /* "kivyblocks/blocks.pyx":430 * b = Blocks() * b.bind(on_built=partial(doit,target,add_mode)) * b.bind(on_failed=doerr) # <<<<<<<<<<<<<< * b.widgetBuild(opts) * */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_b, __pyx_n_s_bind); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 428, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_b, __pyx_n_s_bind); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 430, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_5 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 428, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 430, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_on_failed, __pyx_v_doerr) < 0) __PYX_ERR(0, 428, __pyx_L1_error) - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_empty_tuple, __pyx_t_5); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 428, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_on_failed, __pyx_v_doerr) < 0) __PYX_ERR(0, 430, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_empty_tuple, __pyx_t_5); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 430, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":429 + /* "kivyblocks/blocks.pyx":431 * b.bind(on_built=partial(doit,target,add_mode)) * b.bind(on_failed=doerr) * b.widgetBuild(opts) # <<<<<<<<<<<<<< * * def urlwidgetAction(self, widget:Widget, desc, *args): */ - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_b, __pyx_n_s_widgetBuild); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 429, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_b, __pyx_n_s_widgetBuild); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 431, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __pyx_t_1 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_5))) { @@ -15336,12 +15376,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_38blocksAction(CYTHON_UNU } __pyx_t_2 = (__pyx_t_1) ? __Pyx_PyObject_Call2Args(__pyx_t_5, __pyx_t_1, __pyx_v_opts) : __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_v_opts); __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 429, __pyx_L1_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 431, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":406 + /* "kivyblocks/blocks.pyx":405 * return Blocks.getWidgetById(desc.get('target'),from_widget=widget) * * def blocksAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< @@ -15376,12 +15416,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_38blocksAction(CYTHON_UNU return __pyx_r; } -/* "kivyblocks/blocks.pyx":431 +/* "kivyblocks/blocks.pyx":433 * b.widgetBuild(opts) * * def urlwidgetAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< - * target = self.get_target(widget, desc) - * add_mode = desc.get('mode','replace') + * Logger.info('Block: urlwidgetAction() called, desc=%s, args=%s', \ + * str(desc), */ /* Python wrapper */ @@ -15433,18 +15473,18 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_41urlwidgetAction(PyObjec case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_widget)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("urlwidgetAction", 0, 3, 3, 1); __PYX_ERR(0, 431, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("urlwidgetAction", 0, 3, 3, 1); __PYX_ERR(0, 433, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: if (likely((values[2] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_desc)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("urlwidgetAction", 0, 3, 3, 2); __PYX_ERR(0, 431, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("urlwidgetAction", 0, 3, 3, 2); __PYX_ERR(0, 433, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { const Py_ssize_t used_pos_args = (pos_args < 3) ? pos_args : 3; - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, used_pos_args, "urlwidgetAction") < 0)) __PYX_ERR(0, 431, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, used_pos_args, "urlwidgetAction") < 0)) __PYX_ERR(0, 433, __pyx_L3_error) } } else if (PyTuple_GET_SIZE(__pyx_args) < 3) { goto __pyx_L5_argtuple_error; @@ -15459,7 +15499,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_41urlwidgetAction(PyObjec } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("urlwidgetAction", 0, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 431, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("urlwidgetAction", 0, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 433, __pyx_L3_error) __pyx_L3_error:; __Pyx_DECREF(__pyx_v_args); __pyx_v_args = 0; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.urlwidgetAction", __pyx_clineno, __pyx_lineno, __pyx_filename); @@ -15474,12 +15514,12 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_41urlwidgetAction(PyObjec return __pyx_r; } -/* "kivyblocks/blocks.pyx":447 +/* "kivyblocks/blocks.pyx":453 * } * * def doit(target:Widget, add_mode:str, o, w:Widget): # <<<<<<<<<<<<<< - * if target: - * if add_mode == 'replace': + * if isinstance(w, ModalView): + * return */ /* Python wrapper */ @@ -15523,23 +15563,23 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_15urlwidgetAction_1doit(P case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_add_mode)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("doit", 1, 4, 4, 1); __PYX_ERR(0, 447, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("doit", 1, 4, 4, 1); __PYX_ERR(0, 453, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: if (likely((values[2] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_o)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("doit", 1, 4, 4, 2); __PYX_ERR(0, 447, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("doit", 1, 4, 4, 2); __PYX_ERR(0, 453, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 3: if (likely((values[3] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_w)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("doit", 1, 4, 4, 3); __PYX_ERR(0, 447, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("doit", 1, 4, 4, 3); __PYX_ERR(0, 453, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "doit") < 0)) __PYX_ERR(0, 447, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "doit") < 0)) __PYX_ERR(0, 453, __pyx_L3_error) } } else if (PyTuple_GET_SIZE(__pyx_args) != 4) { goto __pyx_L5_argtuple_error; @@ -15556,13 +15596,13 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_15urlwidgetAction_1doit(P } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("doit", 1, 4, 4, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 447, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("doit", 1, 4, 4, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 453, __pyx_L3_error) __pyx_L3_error:; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.urlwidgetAction.doit", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); return NULL; __pyx_L4_argument_unpacking_done:; - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_add_mode), (&PyString_Type), 1, "add_mode", 1))) __PYX_ERR(0, 447, __pyx_L1_error) + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_add_mode), (&PyString_Type), 1, "add_mode", 1))) __PYX_ERR(0, 453, __pyx_L1_error) __pyx_r = __pyx_pf_10kivyblocks_6blocks_6Blocks_15urlwidgetAction_doit(__pyx_self, __pyx_v_target, __pyx_v_add_mode, __pyx_v_o, __pyx_v_w); /* function exit code */ @@ -15577,9 +15617,9 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_15urlwidgetAction_1doit(P static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_15urlwidgetAction_doit(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_target, PyObject *__pyx_v_add_mode, CYTHON_UNUSED PyObject *__pyx_v_o, PyObject *__pyx_v_w) { PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations - int __pyx_t_1; + PyObject *__pyx_t_1 = NULL; int __pyx_t_2; - PyObject *__pyx_t_3 = NULL; + int __pyx_t_3; PyObject *__pyx_t_4 = NULL; PyObject *__pyx_t_5 = NULL; int __pyx_lineno = 0; @@ -15587,35 +15627,69 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_15urlwidgetAction_doit(CY int __pyx_clineno = 0; __Pyx_RefNannySetupContext("doit", 0); - /* "kivyblocks/blocks.pyx":448 + /* "kivyblocks/blocks.pyx":454 * * def doit(target:Widget, add_mode:str, o, w:Widget): + * if isinstance(w, ModalView): # <<<<<<<<<<<<<< + * return + * + */ + __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_ModalView); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 454, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + __pyx_t_2 = PyObject_IsInstance(__pyx_v_w, __pyx_t_1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 454, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_3 = (__pyx_t_2 != 0); + if (__pyx_t_3) { + + /* "kivyblocks/blocks.pyx":455 + * def doit(target:Widget, add_mode:str, o, w:Widget): + * if isinstance(w, ModalView): + * return # <<<<<<<<<<<<<< + * + * if target: + */ + __Pyx_XDECREF(__pyx_r); + __pyx_r = Py_None; __Pyx_INCREF(Py_None); + goto __pyx_L0; + + /* "kivyblocks/blocks.pyx":454 + * + * def doit(target:Widget, add_mode:str, o, w:Widget): + * if isinstance(w, ModalView): # <<<<<<<<<<<<<< + * return + * + */ + } + + /* "kivyblocks/blocks.pyx":457 + * return + * * if target: # <<<<<<<<<<<<<< * if add_mode == 'replace': * target.clear_widgets() */ - __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_v_target); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 448, __pyx_L1_error) - if (__pyx_t_1) { + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_target); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 457, __pyx_L1_error) + if (__pyx_t_3) { - /* "kivyblocks/blocks.pyx":449 - * def doit(target:Widget, add_mode:str, o, w:Widget): + /* "kivyblocks/blocks.pyx":458 + * * if target: * if add_mode == 'replace': # <<<<<<<<<<<<<< * target.clear_widgets() * target.add_widget(w) */ - __pyx_t_1 = (__Pyx_PyString_Equals(__pyx_v_add_mode, __pyx_n_s_replace, Py_EQ)); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 449, __pyx_L1_error) - __pyx_t_2 = (__pyx_t_1 != 0); + __pyx_t_3 = (__Pyx_PyString_Equals(__pyx_v_add_mode, __pyx_n_s_replace, Py_EQ)); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 458, __pyx_L1_error) + __pyx_t_2 = (__pyx_t_3 != 0); if (__pyx_t_2) { - /* "kivyblocks/blocks.pyx":450 + /* "kivyblocks/blocks.pyx":459 * if target: * if add_mode == 'replace': * target.clear_widgets() # <<<<<<<<<<<<<< * target.add_widget(w) * */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_target, __pyx_n_s_clear_widgets); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 450, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_target, __pyx_n_s_clear_widgets); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 459, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __pyx_t_5 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_4))) { @@ -15627,15 +15701,15 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_15urlwidgetAction_doit(CY __Pyx_DECREF_SET(__pyx_t_4, function); } } - __pyx_t_3 = (__pyx_t_5) ? __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_5) : __Pyx_PyObject_CallNoArg(__pyx_t_4); + __pyx_t_1 = (__pyx_t_5) ? __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_5) : __Pyx_PyObject_CallNoArg(__pyx_t_4); __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 450, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_3); + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 459, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":449 - * def doit(target:Widget, add_mode:str, o, w:Widget): + /* "kivyblocks/blocks.pyx":458 + * * if target: * if add_mode == 'replace': # <<<<<<<<<<<<<< * target.clear_widgets() @@ -15643,14 +15717,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_15urlwidgetAction_doit(CY */ } - /* "kivyblocks/blocks.pyx":451 + /* "kivyblocks/blocks.pyx":460 * if add_mode == 'replace': * target.clear_widgets() * target.add_widget(w) # <<<<<<<<<<<<<< * * def doerr(o,e): */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_target, __pyx_n_s_add_widget); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 451, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_target, __pyx_n_s_add_widget); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 460, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __pyx_t_5 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_4))) { @@ -15662,35 +15736,35 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_15urlwidgetAction_doit(CY __Pyx_DECREF_SET(__pyx_t_4, function); } } - __pyx_t_3 = (__pyx_t_5) ? __Pyx_PyObject_Call2Args(__pyx_t_4, __pyx_t_5, __pyx_v_w) : __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_v_w); + __pyx_t_1 = (__pyx_t_5) ? __Pyx_PyObject_Call2Args(__pyx_t_4, __pyx_t_5, __pyx_v_w) : __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_v_w); __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 451, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_3); + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 460, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":448 + /* "kivyblocks/blocks.pyx":457 + * return * - * def doit(target:Widget, add_mode:str, o, w:Widget): * if target: # <<<<<<<<<<<<<< * if add_mode == 'replace': * target.clear_widgets() */ } - /* "kivyblocks/blocks.pyx":447 + /* "kivyblocks/blocks.pyx":453 * } * * def doit(target:Widget, add_mode:str, o, w:Widget): # <<<<<<<<<<<<<< - * if target: - * if add_mode == 'replace': + * if isinstance(w, ModalView): + * return */ /* function exit code */ __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; __pyx_L1_error:; - __Pyx_XDECREF(__pyx_t_3); + __Pyx_XDECREF(__pyx_t_1); __Pyx_XDECREF(__pyx_t_4); __Pyx_XDECREF(__pyx_t_5); __Pyx_AddTraceback("kivyblocks.blocks.Blocks.urlwidgetAction.doit", __pyx_clineno, __pyx_lineno, __pyx_filename); @@ -15701,7 +15775,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_15urlwidgetAction_doit(CY return __pyx_r; } -/* "kivyblocks/blocks.pyx":453 +/* "kivyblocks/blocks.pyx":462 * target.add_widget(w) * * def doerr(o,e): # <<<<<<<<<<<<<< @@ -15744,11 +15818,11 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_15urlwidgetAction_3doerr( case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_e)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("doerr", 1, 2, 2, 1); __PYX_ERR(0, 453, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("doerr", 1, 2, 2, 1); __PYX_ERR(0, 462, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "doerr") < 0)) __PYX_ERR(0, 453, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "doerr") < 0)) __PYX_ERR(0, 462, __pyx_L3_error) } } else if (PyTuple_GET_SIZE(__pyx_args) != 2) { goto __pyx_L5_argtuple_error; @@ -15761,7 +15835,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_15urlwidgetAction_3doerr( } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("doerr", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 453, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("doerr", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 462, __pyx_L3_error) __pyx_L3_error:; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.urlwidgetAction.doerr", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); @@ -15792,28 +15866,28 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_15urlwidgetAction_2doerr( __pyx_outer_scope = (struct __pyx_obj_10kivyblocks_6blocks___pyx_scope_struct_1_urlwidgetAction *) __Pyx_CyFunction_GetClosure(__pyx_self); __pyx_cur_scope = __pyx_outer_scope; - /* "kivyblocks/blocks.pyx":454 + /* "kivyblocks/blocks.pyx":463 * * def doerr(o,e): * Logger.info('Block: urlwidgetAction(): desc=%s widgetBuild error' # <<<<<<<<<<<<<< * ,str(desc)) * */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Logger); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 454, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Logger); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 463, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_info); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 454, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_info); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 463, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":455 + /* "kivyblocks/blocks.pyx":464 * def doerr(o,e): * Logger.info('Block: urlwidgetAction(): desc=%s widgetBuild error' * ,str(desc)) # <<<<<<<<<<<<<< * * b = Blocks() */ - if (unlikely(!__pyx_cur_scope->__pyx_v_desc)) { __Pyx_RaiseClosureNameError("desc"); __PYX_ERR(0, 455, __pyx_L1_error) } - __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyString_Type)), __pyx_cur_scope->__pyx_v_desc); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 455, __pyx_L1_error) + if (unlikely(!__pyx_cur_scope->__pyx_v_desc)) { __Pyx_RaiseClosureNameError("desc"); __PYX_ERR(0, 464, __pyx_L1_error) } + __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyString_Type)), __pyx_cur_scope->__pyx_v_desc); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 464, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_4 = NULL; __pyx_t_5 = 0; @@ -15830,7 +15904,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_15urlwidgetAction_2doerr( #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_3)) { PyObject *__pyx_temp[3] = {__pyx_t_4, __pyx_kp_s_Block_urlwidgetAction_desc_s_wid, __pyx_t_2}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 454, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 463, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; @@ -15839,14 +15913,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_15urlwidgetAction_2doerr( #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_3)) { PyObject *__pyx_temp[3] = {__pyx_t_4, __pyx_kp_s_Block_urlwidgetAction_desc_s_wid, __pyx_t_2}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 454, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 463, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } else #endif { - __pyx_t_6 = PyTuple_New(2+__pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 454, __pyx_L1_error) + __pyx_t_6 = PyTuple_New(2+__pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 463, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); if (__pyx_t_4) { __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_4); __pyx_t_4 = NULL; @@ -15857,14 +15931,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_15urlwidgetAction_2doerr( __Pyx_GIVEREF(__pyx_t_2); PyTuple_SET_ITEM(__pyx_t_6, 1+__pyx_t_5, __pyx_t_2); __pyx_t_2 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 454, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 463, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; } __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":453 + /* "kivyblocks/blocks.pyx":462 * target.add_widget(w) * * def doerr(o,e): # <<<<<<<<<<<<<< @@ -15889,12 +15963,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_15urlwidgetAction_2doerr( return __pyx_r; } -/* "kivyblocks/blocks.pyx":431 +/* "kivyblocks/blocks.pyx":433 * b.widgetBuild(opts) * * def urlwidgetAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< - * target = self.get_target(widget, desc) - * add_mode = desc.get('mode','replace') + * Logger.info('Block: urlwidgetAction() called, desc=%s, args=%s', \ + * str(desc), */ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_40urlwidgetAction(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_self, PyObject *__pyx_v_widget, PyObject *__pyx_v_desc, PyObject *__pyx_v_args) { @@ -15912,8 +15986,8 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_40urlwidgetAction(CYTHON_ PyObject *__pyx_t_1 = NULL; PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; - int __pyx_t_4; - PyObject *__pyx_t_5 = NULL; + PyObject *__pyx_t_4 = NULL; + int __pyx_t_5; PyObject *__pyx_t_6 = NULL; PyObject *__pyx_t_7 = NULL; int __pyx_t_8; @@ -15928,7 +16002,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_40urlwidgetAction(CYTHON_ if (unlikely(!__pyx_cur_scope)) { __pyx_cur_scope = ((struct __pyx_obj_10kivyblocks_6blocks___pyx_scope_struct_1_urlwidgetAction *)Py_None); __Pyx_INCREF(Py_None); - __PYX_ERR(0, 431, __pyx_L1_error) + __PYX_ERR(0, 433, __pyx_L1_error) } else { __Pyx_GOTREF(__pyx_cur_scope); } @@ -15936,236 +16010,318 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_40urlwidgetAction(CYTHON_ __Pyx_INCREF(__pyx_cur_scope->__pyx_v_desc); __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_desc); - /* "kivyblocks/blocks.pyx":432 + /* "kivyblocks/blocks.pyx":434 * * def urlwidgetAction(self, widget:Widget, desc, *args): + * Logger.info('Block: urlwidgetAction() called, desc=%s, args=%s', \ # <<<<<<<<<<<<<< + * str(desc), + * args + */ + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Logger); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 434, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_info); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 434, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_3); + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + + /* "kivyblocks/blocks.pyx":435 + * def urlwidgetAction(self, widget:Widget, desc, *args): + * Logger.info('Block: urlwidgetAction() called, desc=%s, args=%s', \ + * str(desc), # <<<<<<<<<<<<<< + * args + * ) + */ + __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyString_Type)), __pyx_cur_scope->__pyx_v_desc); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 435, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + + /* "kivyblocks/blocks.pyx":436 + * Logger.info('Block: urlwidgetAction() called, desc=%s, args=%s', \ + * str(desc), + * args # <<<<<<<<<<<<<< + * ) + * target = self.get_target(widget, desc) + */ + __pyx_t_4 = NULL; + __pyx_t_5 = 0; + if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_3))) { + __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_3); + if (likely(__pyx_t_4)) { + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); + __Pyx_INCREF(__pyx_t_4); + __Pyx_INCREF(function); + __Pyx_DECREF_SET(__pyx_t_3, function); + __pyx_t_5 = 1; + } + } + #if CYTHON_FAST_PYCALL + if (PyFunction_Check(__pyx_t_3)) { + PyObject *__pyx_temp[4] = {__pyx_t_4, __pyx_kp_s_Block_urlwidgetAction_called_des, __pyx_t_2, __pyx_v_args}; + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 3+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 434, __pyx_L1_error) + __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; + __Pyx_GOTREF(__pyx_t_1); + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + } else + #endif + #if CYTHON_FAST_PYCCALL + if (__Pyx_PyFastCFunction_Check(__pyx_t_3)) { + PyObject *__pyx_temp[4] = {__pyx_t_4, __pyx_kp_s_Block_urlwidgetAction_called_des, __pyx_t_2, __pyx_v_args}; + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 3+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 434, __pyx_L1_error) + __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; + __Pyx_GOTREF(__pyx_t_1); + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + } else + #endif + { + __pyx_t_6 = PyTuple_New(3+__pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 434, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_6); + if (__pyx_t_4) { + __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_4); __pyx_t_4 = NULL; + } + __Pyx_INCREF(__pyx_kp_s_Block_urlwidgetAction_called_des); + __Pyx_GIVEREF(__pyx_kp_s_Block_urlwidgetAction_called_des); + PyTuple_SET_ITEM(__pyx_t_6, 0+__pyx_t_5, __pyx_kp_s_Block_urlwidgetAction_called_des); + __Pyx_GIVEREF(__pyx_t_2); + PyTuple_SET_ITEM(__pyx_t_6, 1+__pyx_t_5, __pyx_t_2); + __Pyx_INCREF(__pyx_v_args); + __Pyx_GIVEREF(__pyx_v_args); + PyTuple_SET_ITEM(__pyx_t_6, 2+__pyx_t_5, __pyx_v_args); + __pyx_t_2 = 0; + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 434, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + } + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + + /* "kivyblocks/blocks.pyx":438 + * args + * ) * target = self.get_target(widget, desc) # <<<<<<<<<<<<<< * add_mode = desc.get('mode','replace') * opts = desc.get('options').copy() */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_get_target); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 432, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = NULL; - __pyx_t_4 = 0; - if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { - __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_2); - if (likely(__pyx_t_3)) { - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2); - __Pyx_INCREF(__pyx_t_3); + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_get_target); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 438, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_3); + __pyx_t_6 = NULL; + __pyx_t_5 = 0; + if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_3))) { + __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_3); + if (likely(__pyx_t_6)) { + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); + __Pyx_INCREF(__pyx_t_6); __Pyx_INCREF(function); - __Pyx_DECREF_SET(__pyx_t_2, function); - __pyx_t_4 = 1; + __Pyx_DECREF_SET(__pyx_t_3, function); + __pyx_t_5 = 1; } } #if CYTHON_FAST_PYCALL - if (PyFunction_Check(__pyx_t_2)) { - PyObject *__pyx_temp[3] = {__pyx_t_3, __pyx_v_widget, __pyx_cur_scope->__pyx_v_desc}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 432, __pyx_L1_error) - __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; + if (PyFunction_Check(__pyx_t_3)) { + PyObject *__pyx_temp[3] = {__pyx_t_6, __pyx_v_widget, __pyx_cur_scope->__pyx_v_desc}; + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 438, __pyx_L1_error) + __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_GOTREF(__pyx_t_1); } else #endif #if CYTHON_FAST_PYCCALL - if (__Pyx_PyFastCFunction_Check(__pyx_t_2)) { - PyObject *__pyx_temp[3] = {__pyx_t_3, __pyx_v_widget, __pyx_cur_scope->__pyx_v_desc}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 432, __pyx_L1_error) - __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; + if (__Pyx_PyFastCFunction_Check(__pyx_t_3)) { + PyObject *__pyx_temp[3] = {__pyx_t_6, __pyx_v_widget, __pyx_cur_scope->__pyx_v_desc}; + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 438, __pyx_L1_error) + __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_GOTREF(__pyx_t_1); } else #endif { - __pyx_t_5 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 432, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); - if (__pyx_t_3) { - __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_3); __pyx_t_3 = NULL; + __pyx_t_2 = PyTuple_New(2+__pyx_t_5); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 438, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + if (__pyx_t_6) { + __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_6); __pyx_t_6 = NULL; } __Pyx_INCREF(__pyx_v_widget); __Pyx_GIVEREF(__pyx_v_widget); - PyTuple_SET_ITEM(__pyx_t_5, 0+__pyx_t_4, __pyx_v_widget); + PyTuple_SET_ITEM(__pyx_t_2, 0+__pyx_t_5, __pyx_v_widget); __Pyx_INCREF(__pyx_cur_scope->__pyx_v_desc); __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_desc); - PyTuple_SET_ITEM(__pyx_t_5, 1+__pyx_t_4, __pyx_cur_scope->__pyx_v_desc); - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_5, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 432, __pyx_L1_error) + PyTuple_SET_ITEM(__pyx_t_2, 1+__pyx_t_5, __pyx_cur_scope->__pyx_v_desc); + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 438, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_v_target = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":433 - * def urlwidgetAction(self, widget:Widget, desc, *args): + /* "kivyblocks/blocks.pyx":439 + * ) * target = self.get_target(widget, desc) * add_mode = desc.get('mode','replace') # <<<<<<<<<<<<<< * opts = desc.get('options').copy() * p = opts.get('params',{}).copy() */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 433, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 439, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_tuple__10, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 433, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_tuple__10, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 439, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_v_add_mode = __pyx_t_2; - __pyx_t_2 = 0; + __pyx_v_add_mode = __pyx_t_3; + __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":434 + /* "kivyblocks/blocks.pyx":440 * target = self.get_target(widget, desc) * add_mode = desc.get('mode','replace') * opts = desc.get('options').copy() # <<<<<<<<<<<<<< * p = opts.get('params',{}).copy() * if len(args) >= 1 and isinstance(args[0],dict): */ - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 434, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); - __pyx_t_3 = NULL; - if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_5))) { - __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_5); - if (likely(__pyx_t_3)) { - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5); - __Pyx_INCREF(__pyx_t_3); + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 440, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + __pyx_t_6 = NULL; + if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { + __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_2); + if (likely(__pyx_t_6)) { + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2); + __Pyx_INCREF(__pyx_t_6); __Pyx_INCREF(function); - __Pyx_DECREF_SET(__pyx_t_5, function); + __Pyx_DECREF_SET(__pyx_t_2, function); } } - __pyx_t_1 = (__pyx_t_3) ? __Pyx_PyObject_Call2Args(__pyx_t_5, __pyx_t_3, __pyx_n_s_options) : __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_n_s_options); - __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 434, __pyx_L1_error) + __pyx_t_1 = (__pyx_t_6) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_6, __pyx_n_s_options) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_n_s_options); + __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 440, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_copy); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 434, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_copy); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 440, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_t_1 = NULL; - if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_5))) { - __pyx_t_1 = PyMethod_GET_SELF(__pyx_t_5); + if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { + __pyx_t_1 = PyMethod_GET_SELF(__pyx_t_2); if (likely(__pyx_t_1)) { - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5); + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2); __Pyx_INCREF(__pyx_t_1); __Pyx_INCREF(function); - __Pyx_DECREF_SET(__pyx_t_5, function); + __Pyx_DECREF_SET(__pyx_t_2, function); } } - __pyx_t_2 = (__pyx_t_1) ? __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_1) : __Pyx_PyObject_CallNoArg(__pyx_t_5); + __pyx_t_3 = (__pyx_t_1) ? __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_t_1) : __Pyx_PyObject_CallNoArg(__pyx_t_2); __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 434, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_v_opts = __pyx_t_2; - __pyx_t_2 = 0; + if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 440, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_3); + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_v_opts = __pyx_t_3; + __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":435 + /* "kivyblocks/blocks.pyx":441 * add_mode = desc.get('mode','replace') * opts = desc.get('options').copy() * p = opts.get('params',{}).copy() # <<<<<<<<<<<<<< * if len(args) >= 1 and isinstance(args[0],dict): * p.update(args[0]) */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_opts, __pyx_n_s_get); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 435, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_opts, __pyx_n_s_get); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 441, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 435, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_3); - __pyx_t_6 = NULL; - __pyx_t_4 = 0; + __pyx_t_6 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 441, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_6); + __pyx_t_4 = NULL; + __pyx_t_5 = 0; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_1))) { - __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_1); - if (likely(__pyx_t_6)) { + __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_1); + if (likely(__pyx_t_4)) { PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_1); - __Pyx_INCREF(__pyx_t_6); + __Pyx_INCREF(__pyx_t_4); __Pyx_INCREF(function); __Pyx_DECREF_SET(__pyx_t_1, function); - __pyx_t_4 = 1; + __pyx_t_5 = 1; } } #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_1)) { - PyObject *__pyx_temp[3] = {__pyx_t_6, __pyx_n_s_params, __pyx_t_3}; - __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 435, __pyx_L1_error) - __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + PyObject *__pyx_temp[3] = {__pyx_t_4, __pyx_n_s_params, __pyx_t_6}; + __pyx_t_2 = __Pyx_PyFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 441, __pyx_L1_error) + __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; + __Pyx_GOTREF(__pyx_t_2); + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; } else #endif #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_1)) { - PyObject *__pyx_temp[3] = {__pyx_t_6, __pyx_n_s_params, __pyx_t_3}; - __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 435, __pyx_L1_error) - __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + PyObject *__pyx_temp[3] = {__pyx_t_4, __pyx_n_s_params, __pyx_t_6}; + __pyx_t_2 = __Pyx_PyCFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 441, __pyx_L1_error) + __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; + __Pyx_GOTREF(__pyx_t_2); + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; } else #endif { - __pyx_t_7 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 435, __pyx_L1_error) + __pyx_t_7 = PyTuple_New(2+__pyx_t_5); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 441, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); - if (__pyx_t_6) { - __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_6); __pyx_t_6 = NULL; + if (__pyx_t_4) { + __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_4); __pyx_t_4 = NULL; } __Pyx_INCREF(__pyx_n_s_params); __Pyx_GIVEREF(__pyx_n_s_params); - PyTuple_SET_ITEM(__pyx_t_7, 0+__pyx_t_4, __pyx_n_s_params); - __Pyx_GIVEREF(__pyx_t_3); - PyTuple_SET_ITEM(__pyx_t_7, 1+__pyx_t_4, __pyx_t_3); - __pyx_t_3 = 0; - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_7, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 435, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); + PyTuple_SET_ITEM(__pyx_t_7, 0+__pyx_t_5, __pyx_n_s_params); + __Pyx_GIVEREF(__pyx_t_6); + PyTuple_SET_ITEM(__pyx_t_7, 1+__pyx_t_5, __pyx_t_6); + __pyx_t_6 = 0; + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_7, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 441, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; } __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_copy); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 435, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_copy); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 441, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = NULL; + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_t_2 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_1))) { - __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_1); - if (likely(__pyx_t_5)) { + __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_1); + if (likely(__pyx_t_2)) { PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_1); - __Pyx_INCREF(__pyx_t_5); + __Pyx_INCREF(__pyx_t_2); __Pyx_INCREF(function); __Pyx_DECREF_SET(__pyx_t_1, function); } } - __pyx_t_2 = (__pyx_t_5) ? __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_t_5) : __Pyx_PyObject_CallNoArg(__pyx_t_1); - __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 435, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); + __pyx_t_3 = (__pyx_t_2) ? __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_t_2) : __Pyx_PyObject_CallNoArg(__pyx_t_1); + __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; + if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 441, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_v_p = __pyx_t_2; - __pyx_t_2 = 0; + __pyx_v_p = __pyx_t_3; + __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":436 + /* "kivyblocks/blocks.pyx":442 * opts = desc.get('options').copy() * p = opts.get('params',{}).copy() * if len(args) >= 1 and isinstance(args[0],dict): # <<<<<<<<<<<<<< * p.update(args[0]) * d = self.getActionData(widget, desc, *args) */ - __pyx_t_9 = PyTuple_GET_SIZE(__pyx_v_args); if (unlikely(__pyx_t_9 == ((Py_ssize_t)-1))) __PYX_ERR(0, 436, __pyx_L1_error) + __pyx_t_9 = PyTuple_GET_SIZE(__pyx_v_args); if (unlikely(__pyx_t_9 == ((Py_ssize_t)-1))) __PYX_ERR(0, 442, __pyx_L1_error) __pyx_t_10 = ((__pyx_t_9 >= 1) != 0); if (__pyx_t_10) { } else { __pyx_t_8 = __pyx_t_10; goto __pyx_L4_bool_binop_done; } - __pyx_t_2 = __Pyx_GetItemInt_Tuple(__pyx_v_args, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 436, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_10 = PyDict_Check(__pyx_t_2); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_t_3 = __Pyx_GetItemInt_Tuple(__pyx_v_args, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 442, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_3); + __pyx_t_10 = PyDict_Check(__pyx_t_3); + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_t_11 = (__pyx_t_10 != 0); __pyx_t_8 = __pyx_t_11; __pyx_L4_bool_binop_done:; if (__pyx_t_8) { - /* "kivyblocks/blocks.pyx":437 + /* "kivyblocks/blocks.pyx":443 * p = opts.get('params',{}).copy() * if len(args) >= 1 and isinstance(args[0],dict): * p.update(args[0]) # <<<<<<<<<<<<<< * d = self.getActionData(widget, desc, *args) * if d: */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_p, __pyx_n_s_update); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 437, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_p, __pyx_n_s_update); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 443, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_5 = __Pyx_GetItemInt_Tuple(__pyx_v_args, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 437, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); + __pyx_t_2 = __Pyx_GetItemInt_Tuple(__pyx_v_args, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 443, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); __pyx_t_7 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_1))) { __pyx_t_7 = PyMethod_GET_SELF(__pyx_t_1); @@ -16176,15 +16332,15 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_40urlwidgetAction(CYTHON_ __Pyx_DECREF_SET(__pyx_t_1, function); } } - __pyx_t_2 = (__pyx_t_7) ? __Pyx_PyObject_Call2Args(__pyx_t_1, __pyx_t_7, __pyx_t_5) : __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_t_5); + __pyx_t_3 = (__pyx_t_7) ? __Pyx_PyObject_Call2Args(__pyx_t_1, __pyx_t_7, __pyx_t_2) : __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_t_2); __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 437, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 443, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_3); + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":436 + /* "kivyblocks/blocks.pyx":442 * opts = desc.get('options').copy() * p = opts.get('params',{}).copy() * if len(args) >= 1 and isinstance(args[0],dict): # <<<<<<<<<<<<<< @@ -16193,16 +16349,16 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_40urlwidgetAction(CYTHON_ */ } - /* "kivyblocks/blocks.pyx":438 + /* "kivyblocks/blocks.pyx":444 * if len(args) >= 1 and isinstance(args[0],dict): * p.update(args[0]) * d = self.getActionData(widget, desc, *args) # <<<<<<<<<<<<<< * if d: * p.update(d) */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_getActionData); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 438, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 438, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_getActionData); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 444, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_3); + __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 444, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_v_widget); __Pyx_GIVEREF(__pyx_v_widget); @@ -16210,53 +16366,53 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_40urlwidgetAction(CYTHON_ __Pyx_INCREF(__pyx_cur_scope->__pyx_v_desc); __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_desc); PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_cur_scope->__pyx_v_desc); - __pyx_t_5 = PyNumber_Add(__pyx_t_1, __pyx_v_args); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 438, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); + __pyx_t_2 = PyNumber_Add(__pyx_t_1, __pyx_v_args); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 444, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_5, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 438, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 444, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_v_d = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":439 + /* "kivyblocks/blocks.pyx":445 * p.update(args[0]) * d = self.getActionData(widget, desc, *args) * if d: # <<<<<<<<<<<<<< * p.update(d) * opts['params'] = p */ - __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_v_d); if (unlikely(__pyx_t_8 < 0)) __PYX_ERR(0, 439, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_v_d); if (unlikely(__pyx_t_8 < 0)) __PYX_ERR(0, 445, __pyx_L1_error) if (__pyx_t_8) { - /* "kivyblocks/blocks.pyx":440 + /* "kivyblocks/blocks.pyx":446 * d = self.getActionData(widget, desc, *args) * if d: * p.update(d) # <<<<<<<<<<<<<< * opts['params'] = p * d = { */ - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_p, __pyx_n_s_update); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 440, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); - __pyx_t_2 = NULL; - if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_5))) { - __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_5); - if (likely(__pyx_t_2)) { - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5); - __Pyx_INCREF(__pyx_t_2); + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_p, __pyx_n_s_update); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 446, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + __pyx_t_3 = NULL; + if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { + __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_2); + if (likely(__pyx_t_3)) { + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2); + __Pyx_INCREF(__pyx_t_3); __Pyx_INCREF(function); - __Pyx_DECREF_SET(__pyx_t_5, function); + __Pyx_DECREF_SET(__pyx_t_2, function); } } - __pyx_t_1 = (__pyx_t_2) ? __Pyx_PyObject_Call2Args(__pyx_t_5, __pyx_t_2, __pyx_v_d) : __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_v_d); - __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 440, __pyx_L1_error) + __pyx_t_1 = (__pyx_t_3) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_3, __pyx_v_d) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_v_d); + __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 446, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":439 + /* "kivyblocks/blocks.pyx":445 * p.update(args[0]) * d = self.getActionData(widget, desc, *args) * if d: # <<<<<<<<<<<<<< @@ -16265,220 +16421,220 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_40urlwidgetAction(CYTHON_ */ } - /* "kivyblocks/blocks.pyx":441 + /* "kivyblocks/blocks.pyx":447 * if d: * p.update(d) * opts['params'] = p # <<<<<<<<<<<<<< * d = { * 'widgettype' : 'urlwidget', */ - if (unlikely(PyObject_SetItem(__pyx_v_opts, __pyx_n_s_params, __pyx_v_p) < 0)) __PYX_ERR(0, 441, __pyx_L1_error) + if (unlikely(PyObject_SetItem(__pyx_v_opts, __pyx_n_s_params, __pyx_v_p) < 0)) __PYX_ERR(0, 447, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":443 + /* "kivyblocks/blocks.pyx":449 * opts['params'] = p * d = { * 'widgettype' : 'urlwidget', # <<<<<<<<<<<<<< * 'options': opts * } */ - __pyx_t_1 = __Pyx_PyDict_NewPresized(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 443, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyDict_NewPresized(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 449, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_widgettype, __pyx_n_s_urlwidget) < 0) __PYX_ERR(0, 443, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_widgettype, __pyx_n_s_urlwidget) < 0) __PYX_ERR(0, 449, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":444 + /* "kivyblocks/blocks.pyx":450 * d = { * 'widgettype' : 'urlwidget', * 'options': opts # <<<<<<<<<<<<<< * } * */ - if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_options, __pyx_v_opts) < 0) __PYX_ERR(0, 443, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_options, __pyx_v_opts) < 0) __PYX_ERR(0, 449, __pyx_L1_error) __Pyx_DECREF_SET(__pyx_v_d, __pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":447 + /* "kivyblocks/blocks.pyx":453 * } * * def doit(target:Widget, add_mode:str, o, w:Widget): # <<<<<<<<<<<<<< - * if target: - * if add_mode == 'replace': + * if isinstance(w, ModalView): + * return */ - __pyx_t_1 = __Pyx_PyDict_NewPresized(3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 447, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyDict_NewPresized(3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 453, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_Widget); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 447, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); - if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_target, __pyx_t_5) < 0) __PYX_ERR(0, 447, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_add_mode, __pyx_n_u_str_2) < 0) __PYX_ERR(0, 447, __pyx_L1_error) - __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_Widget); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 447, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); - if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_w, __pyx_t_5) < 0) __PYX_ERR(0, 447, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_15urlwidgetAction_1doit, 0, __pyx_n_s_Blocks_urlwidgetAction_locals_do, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__16)); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 447, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); - __Pyx_CyFunction_SetAnnotationsDict(__pyx_t_5, __pyx_t_1); + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Widget); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 453, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_target, __pyx_t_2) < 0) __PYX_ERR(0, 453, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_add_mode, __pyx_n_u_str_2) < 0) __PYX_ERR(0, 453, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Widget); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 453, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_w, __pyx_t_2) < 0) __PYX_ERR(0, 453, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_15urlwidgetAction_1doit, 0, __pyx_n_s_Blocks_urlwidgetAction_locals_do, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__16)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 453, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + __Pyx_CyFunction_SetAnnotationsDict(__pyx_t_2, __pyx_t_1); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_v_doit = __pyx_t_5; - __pyx_t_5 = 0; + __pyx_v_doit = __pyx_t_2; + __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":453 + /* "kivyblocks/blocks.pyx":462 * target.add_widget(w) * * def doerr(o,e): # <<<<<<<<<<<<<< * Logger.info('Block: urlwidgetAction(): desc=%s widgetBuild error' * ,str(desc)) */ - __pyx_t_5 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_15urlwidgetAction_3doerr, 0, __pyx_n_s_Blocks_urlwidgetAction_locals_do_2, ((PyObject*)__pyx_cur_scope), __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__18)); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 453, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); - __pyx_v_doerr = __pyx_t_5; - __pyx_t_5 = 0; + __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_15urlwidgetAction_3doerr, 0, __pyx_n_s_Blocks_urlwidgetAction_locals_do_2, ((PyObject*)__pyx_cur_scope), __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__18)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 462, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + __pyx_v_doerr = __pyx_t_2; + __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":457 + /* "kivyblocks/blocks.pyx":466 * ,str(desc)) * * b = Blocks() # <<<<<<<<<<<<<< * b.bind(on_built=partial(doit,target,add_mode)) * b.bind(on_failed=doerr) */ - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_Blocks); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 457, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_Blocks); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 466, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = NULL; + __pyx_t_3 = NULL; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_1))) { - __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_1); - if (likely(__pyx_t_2)) { + __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_1); + if (likely(__pyx_t_3)) { PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_1); - __Pyx_INCREF(__pyx_t_2); + __Pyx_INCREF(__pyx_t_3); __Pyx_INCREF(function); __Pyx_DECREF_SET(__pyx_t_1, function); } } - __pyx_t_5 = (__pyx_t_2) ? __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_t_2) : __Pyx_PyObject_CallNoArg(__pyx_t_1); - __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 457, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); + __pyx_t_2 = (__pyx_t_3) ? __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_t_3) : __Pyx_PyObject_CallNoArg(__pyx_t_1); + __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 466, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_v_b = __pyx_t_5; - __pyx_t_5 = 0; + __pyx_v_b = __pyx_t_2; + __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":458 + /* "kivyblocks/blocks.pyx":467 * * b = Blocks() * b.bind(on_built=partial(doit,target,add_mode)) # <<<<<<<<<<<<<< * b.bind(on_failed=doerr) * b.widgetBuild(d) */ - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_b, __pyx_n_s_bind); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 458, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); - __pyx_t_1 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 458, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_b, __pyx_n_s_bind); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 467, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + __pyx_t_1 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 467, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_n_s_partial); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 458, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_n_s_partial); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 467, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); - __pyx_t_3 = NULL; - __pyx_t_4 = 0; + __pyx_t_6 = NULL; + __pyx_t_5 = 0; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_7))) { - __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_7); - if (likely(__pyx_t_3)) { + __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_7); + if (likely(__pyx_t_6)) { PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_7); - __Pyx_INCREF(__pyx_t_3); + __Pyx_INCREF(__pyx_t_6); __Pyx_INCREF(function); __Pyx_DECREF_SET(__pyx_t_7, function); - __pyx_t_4 = 1; + __pyx_t_5 = 1; } } #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_7)) { - PyObject *__pyx_temp[4] = {__pyx_t_3, __pyx_v_doit, __pyx_v_target, __pyx_v_add_mode}; - __pyx_t_2 = __Pyx_PyFunction_FastCall(__pyx_t_7, __pyx_temp+1-__pyx_t_4, 3+__pyx_t_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 458, __pyx_L1_error) - __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_GOTREF(__pyx_t_2); + PyObject *__pyx_temp[4] = {__pyx_t_6, __pyx_v_doit, __pyx_v_target, __pyx_v_add_mode}; + __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_7, __pyx_temp+1-__pyx_t_5, 3+__pyx_t_5); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 467, __pyx_L1_error) + __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; + __Pyx_GOTREF(__pyx_t_3); } else #endif #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_7)) { - PyObject *__pyx_temp[4] = {__pyx_t_3, __pyx_v_doit, __pyx_v_target, __pyx_v_add_mode}; - __pyx_t_2 = __Pyx_PyCFunction_FastCall(__pyx_t_7, __pyx_temp+1-__pyx_t_4, 3+__pyx_t_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 458, __pyx_L1_error) - __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_GOTREF(__pyx_t_2); + PyObject *__pyx_temp[4] = {__pyx_t_6, __pyx_v_doit, __pyx_v_target, __pyx_v_add_mode}; + __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_7, __pyx_temp+1-__pyx_t_5, 3+__pyx_t_5); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 467, __pyx_L1_error) + __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; + __Pyx_GOTREF(__pyx_t_3); } else #endif { - __pyx_t_6 = PyTuple_New(3+__pyx_t_4); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 458, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_6); - if (__pyx_t_3) { - __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_3); __pyx_t_3 = NULL; + __pyx_t_4 = PyTuple_New(3+__pyx_t_5); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 467, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + if (__pyx_t_6) { + __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_6); __pyx_t_6 = NULL; } __Pyx_INCREF(__pyx_v_doit); __Pyx_GIVEREF(__pyx_v_doit); - PyTuple_SET_ITEM(__pyx_t_6, 0+__pyx_t_4, __pyx_v_doit); + PyTuple_SET_ITEM(__pyx_t_4, 0+__pyx_t_5, __pyx_v_doit); __Pyx_INCREF(__pyx_v_target); __Pyx_GIVEREF(__pyx_v_target); - PyTuple_SET_ITEM(__pyx_t_6, 1+__pyx_t_4, __pyx_v_target); + PyTuple_SET_ITEM(__pyx_t_4, 1+__pyx_t_5, __pyx_v_target); __Pyx_INCREF(__pyx_v_add_mode); __Pyx_GIVEREF(__pyx_v_add_mode); - PyTuple_SET_ITEM(__pyx_t_6, 2+__pyx_t_4, __pyx_v_add_mode); - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_6, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 458, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + PyTuple_SET_ITEM(__pyx_t_4, 2+__pyx_t_5, __pyx_v_add_mode); + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 467, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_3); + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; } __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_on_built, __pyx_t_2) < 0) __PYX_ERR(0, 458, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_on_built, __pyx_t_3) < 0) __PYX_ERR(0, 467, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_empty_tuple, __pyx_t_1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 467, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_empty_tuple, __pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 458, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":459 + /* "kivyblocks/blocks.pyx":468 * b = Blocks() * b.bind(on_built=partial(doit,target,add_mode)) * b.bind(on_failed=doerr) # <<<<<<<<<<<<<< * b.widgetBuild(d) * */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_b, __pyx_n_s_bind); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 459, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_1 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 459, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_b, __pyx_n_s_bind); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 468, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_3); + __pyx_t_1 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 468, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_on_failed, __pyx_v_doerr) < 0) __PYX_ERR(0, 459, __pyx_L1_error) - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_empty_tuple, __pyx_t_1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 459, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_on_failed, __pyx_v_doerr) < 0) __PYX_ERR(0, 468, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_empty_tuple, __pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 468, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":460 + /* "kivyblocks/blocks.pyx":469 * b.bind(on_built=partial(doit,target,add_mode)) * b.bind(on_failed=doerr) * b.widgetBuild(d) # <<<<<<<<<<<<<< * - * def getActionData(self, widget:Widget, desc,*args): + * def getActionData(self, widget:Widget, desc, *args): */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_b, __pyx_n_s_widgetBuild); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 460, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_b, __pyx_n_s_widgetBuild); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 469, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = NULL; + __pyx_t_3 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_1))) { - __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_1); - if (likely(__pyx_t_2)) { + __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_1); + if (likely(__pyx_t_3)) { PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_1); - __Pyx_INCREF(__pyx_t_2); + __Pyx_INCREF(__pyx_t_3); __Pyx_INCREF(function); __Pyx_DECREF_SET(__pyx_t_1, function); } } - __pyx_t_5 = (__pyx_t_2) ? __Pyx_PyObject_Call2Args(__pyx_t_1, __pyx_t_2, __pyx_v_d) : __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_v_d); - __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 460, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); + __pyx_t_2 = (__pyx_t_3) ? __Pyx_PyObject_Call2Args(__pyx_t_1, __pyx_t_3, __pyx_v_d) : __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_v_d); + __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 469, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":431 + /* "kivyblocks/blocks.pyx":433 * b.widgetBuild(opts) * * def urlwidgetAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< - * target = self.get_target(widget, desc) - * add_mode = desc.get('mode','replace') + * Logger.info('Block: urlwidgetAction() called, desc=%s, args=%s', \ + * str(desc), */ /* function exit code */ @@ -16488,7 +16644,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_40urlwidgetAction(CYTHON_ __Pyx_XDECREF(__pyx_t_1); __Pyx_XDECREF(__pyx_t_2); __Pyx_XDECREF(__pyx_t_3); - __Pyx_XDECREF(__pyx_t_5); + __Pyx_XDECREF(__pyx_t_4); __Pyx_XDECREF(__pyx_t_6); __Pyx_XDECREF(__pyx_t_7); __Pyx_AddTraceback("kivyblocks.blocks.Blocks.urlwidgetAction", __pyx_clineno, __pyx_lineno, __pyx_filename); @@ -16508,12 +16664,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_40urlwidgetAction(CYTHON_ return __pyx_r; } -/* "kivyblocks/blocks.pyx":462 +/* "kivyblocks/blocks.pyx":471 * b.widgetBuild(d) * - * def getActionData(self, widget:Widget, desc,*args): # <<<<<<<<<<<<<< - * data = {} - * rtdesc = self.build_rtdesc(desc) + * def getActionData(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< + * Logger.info('Block: getActionData(): desc=%s args=%s' + * ,str(desc), args) */ /* Python wrapper */ @@ -16565,18 +16721,18 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_43getActionData(PyObject case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_widget)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("getActionData", 0, 3, 3, 1); __PYX_ERR(0, 462, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("getActionData", 0, 3, 3, 1); __PYX_ERR(0, 471, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: if (likely((values[2] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_desc)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("getActionData", 0, 3, 3, 2); __PYX_ERR(0, 462, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("getActionData", 0, 3, 3, 2); __PYX_ERR(0, 471, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { const Py_ssize_t used_pos_args = (pos_args < 3) ? pos_args : 3; - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, used_pos_args, "getActionData") < 0)) __PYX_ERR(0, 462, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, used_pos_args, "getActionData") < 0)) __PYX_ERR(0, 471, __pyx_L3_error) } } else if (PyTuple_GET_SIZE(__pyx_args) < 3) { goto __pyx_L5_argtuple_error; @@ -16591,7 +16747,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_43getActionData(PyObject } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("getActionData", 0, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 462, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("getActionData", 0, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 471, __pyx_L3_error) __pyx_L3_error:; __Pyx_DECREF(__pyx_v_args); __pyx_v_args = 0; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.getActionData", __pyx_clineno, __pyx_lineno, __pyx_filename); @@ -16615,8 +16771,8 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_42getActionData(CYTHON_UN PyObject *__pyx_t_1 = NULL; PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; - int __pyx_t_4; - PyObject *__pyx_t_5 = NULL; + PyObject *__pyx_t_4 = NULL; + int __pyx_t_5; PyObject *__pyx_t_6 = NULL; int __pyx_t_7; int __pyx_lineno = 0; @@ -16624,214 +16780,326 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_42getActionData(CYTHON_UN int __pyx_clineno = 0; __Pyx_RefNannySetupContext("getActionData", 0); - /* "kivyblocks/blocks.pyx":463 + /* "kivyblocks/blocks.pyx":472 + * + * def getActionData(self, widget:Widget, desc, *args): + * Logger.info('Block: getActionData(): desc=%s args=%s' # <<<<<<<<<<<<<< + * ,str(desc), args) + * + */ + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Logger); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 472, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_info); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 472, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_3); + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + + /* "kivyblocks/blocks.pyx":473 + * def getActionData(self, widget:Widget, desc, *args): + * Logger.info('Block: getActionData(): desc=%s args=%s' + * ,str(desc), args) # <<<<<<<<<<<<<< + * + * data = {} + */ + __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyString_Type)), __pyx_v_desc); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 473, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + __pyx_t_4 = NULL; + __pyx_t_5 = 0; + if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_3))) { + __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_3); + if (likely(__pyx_t_4)) { + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); + __Pyx_INCREF(__pyx_t_4); + __Pyx_INCREF(function); + __Pyx_DECREF_SET(__pyx_t_3, function); + __pyx_t_5 = 1; + } + } + #if CYTHON_FAST_PYCALL + if (PyFunction_Check(__pyx_t_3)) { + PyObject *__pyx_temp[4] = {__pyx_t_4, __pyx_kp_s_Block_getActionData_desc_s_args, __pyx_t_2, __pyx_v_args}; + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 3+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 472, __pyx_L1_error) + __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; + __Pyx_GOTREF(__pyx_t_1); + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + } else + #endif + #if CYTHON_FAST_PYCCALL + if (__Pyx_PyFastCFunction_Check(__pyx_t_3)) { + PyObject *__pyx_temp[4] = {__pyx_t_4, __pyx_kp_s_Block_getActionData_desc_s_args, __pyx_t_2, __pyx_v_args}; + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_5, 3+__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 472, __pyx_L1_error) + __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; + __Pyx_GOTREF(__pyx_t_1); + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + } else + #endif + { + __pyx_t_6 = PyTuple_New(3+__pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 472, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_6); + if (__pyx_t_4) { + __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_4); __pyx_t_4 = NULL; + } + __Pyx_INCREF(__pyx_kp_s_Block_getActionData_desc_s_args); + __Pyx_GIVEREF(__pyx_kp_s_Block_getActionData_desc_s_args); + PyTuple_SET_ITEM(__pyx_t_6, 0+__pyx_t_5, __pyx_kp_s_Block_getActionData_desc_s_args); + __Pyx_GIVEREF(__pyx_t_2); + PyTuple_SET_ITEM(__pyx_t_6, 1+__pyx_t_5, __pyx_t_2); + __Pyx_INCREF(__pyx_v_args); + __Pyx_GIVEREF(__pyx_v_args); + PyTuple_SET_ITEM(__pyx_t_6, 2+__pyx_t_5, __pyx_v_args); + __pyx_t_2 = 0; + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 472, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + } + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + + /* "kivyblocks/blocks.pyx":475 + * ,str(desc), args) * - * def getActionData(self, widget:Widget, desc,*args): * data = {} # <<<<<<<<<<<<<< * rtdesc = self.build_rtdesc(desc) - * rt = self.get_rtdata(widget, rtdesc, *args) + * if rtdesc: */ - __pyx_t_1 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 463, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 475, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_v_data = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":464 - * def getActionData(self, widget:Widget, desc,*args): + /* "kivyblocks/blocks.pyx":476 + * * data = {} * rtdesc = self.build_rtdesc(desc) # <<<<<<<<<<<<<< - * rt = self.get_rtdata(widget, rtdesc, *args) - * data.update(rt) + * if rtdesc: + * rt = self.get_rtdata(widget, rtdesc, *args) */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_build_rtdesc); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 464, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = NULL; - if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { - __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_2); - if (likely(__pyx_t_3)) { - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2); - __Pyx_INCREF(__pyx_t_3); + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_build_rtdesc); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 476, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_3); + __pyx_t_6 = NULL; + if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_3))) { + __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_3); + if (likely(__pyx_t_6)) { + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); + __Pyx_INCREF(__pyx_t_6); __Pyx_INCREF(function); - __Pyx_DECREF_SET(__pyx_t_2, function); + __Pyx_DECREF_SET(__pyx_t_3, function); } } - __pyx_t_1 = (__pyx_t_3) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_3, __pyx_v_desc) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_v_desc); - __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 464, __pyx_L1_error) + __pyx_t_1 = (__pyx_t_6) ? __Pyx_PyObject_Call2Args(__pyx_t_3, __pyx_t_6, __pyx_v_desc) : __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_v_desc); + __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 476, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_v_rtdesc = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":465 + /* "kivyblocks/blocks.pyx":477 * data = {} * rtdesc = self.build_rtdesc(desc) - * rt = self.get_rtdata(widget, rtdesc, *args) # <<<<<<<<<<<<<< - * data.update(rt) - * if desc.get('keymapping'): + * if rtdesc: # <<<<<<<<<<<<<< + * rt = self.get_rtdata(widget, rtdesc, *args) + * if rt: */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_get_rtdata); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 465, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 465, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __Pyx_INCREF(__pyx_v_widget); - __Pyx_GIVEREF(__pyx_v_widget); - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_widget); - __Pyx_INCREF(__pyx_v_rtdesc); - __Pyx_GIVEREF(__pyx_v_rtdesc); - PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_v_rtdesc); - __pyx_t_3 = PyNumber_Add(__pyx_t_2, __pyx_v_args); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 465, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 465, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_v_rt = __pyx_t_2; - __pyx_t_2 = 0; + __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_v_rtdesc); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 477, __pyx_L1_error) + if (__pyx_t_7) { - /* "kivyblocks/blocks.pyx":466 + /* "kivyblocks/blocks.pyx":478 * rtdesc = self.build_rtdesc(desc) - * rt = self.get_rtdata(widget, rtdesc, *args) - * data.update(rt) # <<<<<<<<<<<<<< - * if desc.get('keymapping'): - * data = keyMapping(data, desc.get('keymapping')) + * if rtdesc: + * rt = self.get_rtdata(widget, rtdesc, *args) # <<<<<<<<<<<<<< + * if rt: + * data.update(rt) */ - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_data, __pyx_n_s_update); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 466, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_3); - __pyx_t_1 = NULL; - if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_3))) { - __pyx_t_1 = PyMethod_GET_SELF(__pyx_t_3); - if (likely(__pyx_t_1)) { - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); - __Pyx_INCREF(__pyx_t_1); - __Pyx_INCREF(function); - __Pyx_DECREF_SET(__pyx_t_3, function); - } - } - __pyx_t_2 = (__pyx_t_1) ? __Pyx_PyObject_Call2Args(__pyx_t_3, __pyx_t_1, __pyx_v_rt) : __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_v_rt); - __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 466, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_get_rtdata); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 478, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 478, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_3); + __Pyx_INCREF(__pyx_v_widget); + __Pyx_GIVEREF(__pyx_v_widget); + PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_widget); + __Pyx_INCREF(__pyx_v_rtdesc); + __Pyx_GIVEREF(__pyx_v_rtdesc); + PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_v_rtdesc); + __pyx_t_6 = PyNumber_Add(__pyx_t_3, __pyx_v_args); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 478, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_6); + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_6, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 478, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_3); + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + __pyx_v_rt = __pyx_t_3; + __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":467 - * rt = self.get_rtdata(widget, rtdesc, *args) - * data.update(rt) - * if desc.get('keymapping'): # <<<<<<<<<<<<<< - * data = keyMapping(data, desc.get('keymapping')) + /* "kivyblocks/blocks.pyx":479 + * if rtdesc: + * rt = self.get_rtdata(widget, rtdesc, *args) + * if rt: # <<<<<<<<<<<<<< + * data.update(rt) + * if desc.get('keymapping'): + */ + __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_v_rt); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 479, __pyx_L1_error) + if (__pyx_t_7) { + + /* "kivyblocks/blocks.pyx":480 + * rt = self.get_rtdata(widget, rtdesc, *args) + * if rt: + * data.update(rt) # <<<<<<<<<<<<<< + * if desc.get('keymapping'): + * data = keyMapping(data, desc.get('keymapping')) + */ + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_data, __pyx_n_s_update); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 480, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_6); + __pyx_t_1 = NULL; + if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_6))) { + __pyx_t_1 = PyMethod_GET_SELF(__pyx_t_6); + if (likely(__pyx_t_1)) { + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_6); + __Pyx_INCREF(__pyx_t_1); + __Pyx_INCREF(function); + __Pyx_DECREF_SET(__pyx_t_6, function); + } + } + __pyx_t_3 = (__pyx_t_1) ? __Pyx_PyObject_Call2Args(__pyx_t_6, __pyx_t_1, __pyx_v_rt) : __Pyx_PyObject_CallOneArg(__pyx_t_6, __pyx_v_rt); + __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; + if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 480, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_3); + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + + /* "kivyblocks/blocks.pyx":479 + * if rtdesc: + * rt = self.get_rtdata(widget, rtdesc, *args) + * if rt: # <<<<<<<<<<<<<< + * data.update(rt) + * if desc.get('keymapping'): + */ + } + + /* "kivyblocks/blocks.pyx":481 + * if rt: + * data.update(rt) + * if desc.get('keymapping'): # <<<<<<<<<<<<<< + * data = keyMapping(data, desc.get('keymapping')) * return data */ - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 467, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_3); - __pyx_t_1 = NULL; - if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_3))) { - __pyx_t_1 = PyMethod_GET_SELF(__pyx_t_3); - if (likely(__pyx_t_1)) { - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); - __Pyx_INCREF(__pyx_t_1); - __Pyx_INCREF(function); - __Pyx_DECREF_SET(__pyx_t_3, function); + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 481, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_6); + __pyx_t_1 = NULL; + if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_6))) { + __pyx_t_1 = PyMethod_GET_SELF(__pyx_t_6); + if (likely(__pyx_t_1)) { + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_6); + __Pyx_INCREF(__pyx_t_1); + __Pyx_INCREF(function); + __Pyx_DECREF_SET(__pyx_t_6, function); + } } - } - __pyx_t_2 = (__pyx_t_1) ? __Pyx_PyObject_Call2Args(__pyx_t_3, __pyx_t_1, __pyx_n_s_keymapping) : __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_n_s_keymapping); - __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 467, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 467, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - if (__pyx_t_4) { + __pyx_t_3 = (__pyx_t_1) ? __Pyx_PyObject_Call2Args(__pyx_t_6, __pyx_t_1, __pyx_n_s_keymapping) : __Pyx_PyObject_CallOneArg(__pyx_t_6, __pyx_n_s_keymapping); + __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; + if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 481, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_3); + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 481, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + if (__pyx_t_7) { - /* "kivyblocks/blocks.pyx":468 - * data.update(rt) - * if desc.get('keymapping'): - * data = keyMapping(data, desc.get('keymapping')) # <<<<<<<<<<<<<< + /* "kivyblocks/blocks.pyx":482 + * data.update(rt) + * if desc.get('keymapping'): + * data = keyMapping(data, desc.get('keymapping')) # <<<<<<<<<<<<<< * return data * */ - __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_keyMapping); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 468, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_3); - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 468, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); - __pyx_t_6 = NULL; - if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_5))) { - __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_5); - if (likely(__pyx_t_6)) { - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5); - __Pyx_INCREF(__pyx_t_6); - __Pyx_INCREF(function); - __Pyx_DECREF_SET(__pyx_t_5, function); - } - } - __pyx_t_1 = (__pyx_t_6) ? __Pyx_PyObject_Call2Args(__pyx_t_5, __pyx_t_6, __pyx_n_s_keymapping) : __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_n_s_keymapping); - __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 468, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = NULL; - __pyx_t_7 = 0; - if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_3))) { - __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_3); - if (likely(__pyx_t_5)) { - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); - __Pyx_INCREF(__pyx_t_5); - __Pyx_INCREF(function); - __Pyx_DECREF_SET(__pyx_t_3, function); - __pyx_t_7 = 1; - } - } - #if CYTHON_FAST_PYCALL - if (PyFunction_Check(__pyx_t_3)) { - PyObject *__pyx_temp[3] = {__pyx_t_5, __pyx_v_data, __pyx_t_1}; - __pyx_t_2 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 468, __pyx_L1_error) - __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - } else - #endif - #if CYTHON_FAST_PYCCALL - if (__Pyx_PyFastCFunction_Check(__pyx_t_3)) { - PyObject *__pyx_temp[3] = {__pyx_t_5, __pyx_v_data, __pyx_t_1}; - __pyx_t_2 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 468, __pyx_L1_error) - __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - } else - #endif - { - __pyx_t_6 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 468, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_keyMapping); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 482, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - if (__pyx_t_5) { - __Pyx_GIVEREF(__pyx_t_5); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_5); __pyx_t_5 = NULL; - } - __Pyx_INCREF(__pyx_v_data); - __Pyx_GIVEREF(__pyx_v_data); - PyTuple_SET_ITEM(__pyx_t_6, 0+__pyx_t_7, __pyx_v_data); - __Pyx_GIVEREF(__pyx_t_1); - PyTuple_SET_ITEM(__pyx_t_6, 1+__pyx_t_7, __pyx_t_1); - __pyx_t_1 = 0; - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 468, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 482, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); + __pyx_t_4 = NULL; + if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { + __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_2); + if (likely(__pyx_t_4)) { + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2); + __Pyx_INCREF(__pyx_t_4); + __Pyx_INCREF(function); + __Pyx_DECREF_SET(__pyx_t_2, function); + } + } + __pyx_t_1 = (__pyx_t_4) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_4, __pyx_n_s_keymapping) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_n_s_keymapping); + __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 482, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_t_2 = NULL; + __pyx_t_5 = 0; + if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_6))) { + __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_6); + if (likely(__pyx_t_2)) { + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_6); + __Pyx_INCREF(__pyx_t_2); + __Pyx_INCREF(function); + __Pyx_DECREF_SET(__pyx_t_6, function); + __pyx_t_5 = 1; + } + } + #if CYTHON_FAST_PYCALL + if (PyFunction_Check(__pyx_t_6)) { + PyObject *__pyx_temp[3] = {__pyx_t_2, __pyx_v_data, __pyx_t_1}; + __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_6, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 482, __pyx_L1_error) + __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_GOTREF(__pyx_t_3); + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + } else + #endif + #if CYTHON_FAST_PYCCALL + if (__Pyx_PyFastCFunction_Check(__pyx_t_6)) { + PyObject *__pyx_temp[3] = {__pyx_t_2, __pyx_v_data, __pyx_t_1}; + __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_6, __pyx_temp+1-__pyx_t_5, 2+__pyx_t_5); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 482, __pyx_L1_error) + __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_GOTREF(__pyx_t_3); + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + } else + #endif + { + __pyx_t_4 = PyTuple_New(2+__pyx_t_5); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 482, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + if (__pyx_t_2) { + __Pyx_GIVEREF(__pyx_t_2); PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_2); __pyx_t_2 = NULL; + } + __Pyx_INCREF(__pyx_v_data); + __Pyx_GIVEREF(__pyx_v_data); + PyTuple_SET_ITEM(__pyx_t_4, 0+__pyx_t_5, __pyx_v_data); + __Pyx_GIVEREF(__pyx_t_1); + PyTuple_SET_ITEM(__pyx_t_4, 1+__pyx_t_5, __pyx_t_1); + __pyx_t_1 = 0; + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 482, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_3); + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + } __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - } - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_DECREF_SET(__pyx_v_data, __pyx_t_2); - __pyx_t_2 = 0; + __Pyx_DECREF_SET(__pyx_v_data, __pyx_t_3); + __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":467 - * rt = self.get_rtdata(widget, rtdesc, *args) - * data.update(rt) - * if desc.get('keymapping'): # <<<<<<<<<<<<<< - * data = keyMapping(data, desc.get('keymapping')) + /* "kivyblocks/blocks.pyx":481 + * if rt: + * data.update(rt) + * if desc.get('keymapping'): # <<<<<<<<<<<<<< + * data = keyMapping(data, desc.get('keymapping')) * return data + */ + } + + /* "kivyblocks/blocks.pyx":477 + * data = {} + * rtdesc = self.build_rtdesc(desc) + * if rtdesc: # <<<<<<<<<<<<<< + * rt = self.get_rtdata(widget, rtdesc, *args) + * if rt: */ } - /* "kivyblocks/blocks.pyx":469 - * if desc.get('keymapping'): - * data = keyMapping(data, desc.get('keymapping')) + /* "kivyblocks/blocks.pyx":483 + * if desc.get('keymapping'): + * data = keyMapping(data, desc.get('keymapping')) * return data # <<<<<<<<<<<<<< * * def registedfunctionAction(self, widget:Widget, desc, *args): @@ -16841,12 +17109,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_42getActionData(CYTHON_UN __pyx_r = __pyx_v_data; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":462 + /* "kivyblocks/blocks.pyx":471 * b.widgetBuild(d) * - * def getActionData(self, widget:Widget, desc,*args): # <<<<<<<<<<<<<< - * data = {} - * rtdesc = self.build_rtdesc(desc) + * def getActionData(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< + * Logger.info('Block: getActionData(): desc=%s args=%s' + * ,str(desc), args) */ /* function exit code */ @@ -16854,7 +17122,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_42getActionData(CYTHON_UN __Pyx_XDECREF(__pyx_t_1); __Pyx_XDECREF(__pyx_t_2); __Pyx_XDECREF(__pyx_t_3); - __Pyx_XDECREF(__pyx_t_5); + __Pyx_XDECREF(__pyx_t_4); __Pyx_XDECREF(__pyx_t_6); __Pyx_AddTraceback("kivyblocks.blocks.Blocks.getActionData", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; @@ -16867,7 +17135,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_42getActionData(CYTHON_UN return __pyx_r; } -/* "kivyblocks/blocks.pyx":471 +/* "kivyblocks/blocks.pyx":485 * return data * * def registedfunctionAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< @@ -16924,18 +17192,18 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_45registedfunctionAction( case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_widget)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("registedfunctionAction", 0, 3, 3, 1); __PYX_ERR(0, 471, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("registedfunctionAction", 0, 3, 3, 1); __PYX_ERR(0, 485, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: if (likely((values[2] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_desc)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("registedfunctionAction", 0, 3, 3, 2); __PYX_ERR(0, 471, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("registedfunctionAction", 0, 3, 3, 2); __PYX_ERR(0, 485, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { const Py_ssize_t used_pos_args = (pos_args < 3) ? pos_args : 3; - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, used_pos_args, "registedfunctionAction") < 0)) __PYX_ERR(0, 471, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, used_pos_args, "registedfunctionAction") < 0)) __PYX_ERR(0, 485, __pyx_L3_error) } } else if (PyTuple_GET_SIZE(__pyx_args) < 3) { goto __pyx_L5_argtuple_error; @@ -16950,7 +17218,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_45registedfunctionAction( } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("registedfunctionAction", 0, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 471, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("registedfunctionAction", 0, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 485, __pyx_L3_error) __pyx_L3_error:; __Pyx_DECREF(__pyx_v_args); __pyx_v_args = 0; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.registedfunctionAction", __pyx_clineno, __pyx_lineno, __pyx_filename); @@ -16988,14 +17256,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_44registedfunctionAction( int __pyx_clineno = 0; __Pyx_RefNannySetupContext("registedfunctionAction", 0); - /* "kivyblocks/blocks.pyx":472 + /* "kivyblocks/blocks.pyx":486 * * def registedfunctionAction(self, widget:Widget, desc, *args): * target = self.get_target(widget, desc) # <<<<<<<<<<<<<< * rf = RegisterFunction() * name = desc.get('rfname') */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_get_target); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 472, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_get_target); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 486, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = NULL; __pyx_t_4 = 0; @@ -17012,7 +17280,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_44registedfunctionAction( #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_2)) { PyObject *__pyx_temp[3] = {__pyx_t_3, __pyx_v_widget, __pyx_v_desc}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 472, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 486, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_1); } else @@ -17020,13 +17288,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_44registedfunctionAction( #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_2)) { PyObject *__pyx_temp[3] = {__pyx_t_3, __pyx_v_widget, __pyx_v_desc}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 472, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 486, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_1); } else #endif { - __pyx_t_5 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 472, __pyx_L1_error) + __pyx_t_5 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 486, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); if (__pyx_t_3) { __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_3); __pyx_t_3 = NULL; @@ -17037,7 +17305,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_44registedfunctionAction( __Pyx_INCREF(__pyx_v_desc); __Pyx_GIVEREF(__pyx_v_desc); PyTuple_SET_ITEM(__pyx_t_5, 1+__pyx_t_4, __pyx_v_desc); - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_5, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 472, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_5, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 486, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; } @@ -17045,14 +17313,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_44registedfunctionAction( __pyx_v_target = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":473 + /* "kivyblocks/blocks.pyx":487 * def registedfunctionAction(self, widget:Widget, desc, *args): * target = self.get_target(widget, desc) * rf = RegisterFunction() # <<<<<<<<<<<<<< * name = desc.get('rfname') * func = rf.get(name) */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_RegisterFunction); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 473, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_RegisterFunction); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 487, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_5 = NULL; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_2))) { @@ -17066,20 +17334,20 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_44registedfunctionAction( } __pyx_t_1 = (__pyx_t_5) ? __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_t_5) : __Pyx_PyObject_CallNoArg(__pyx_t_2); __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 473, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 487, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_v_rf = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":474 + /* "kivyblocks/blocks.pyx":488 * target = self.get_target(widget, desc) * rf = RegisterFunction() * name = desc.get('rfname') # <<<<<<<<<<<<<< * func = rf.get(name) * if func is None: */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 474, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 488, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_5 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { @@ -17093,20 +17361,20 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_44registedfunctionAction( } __pyx_t_1 = (__pyx_t_5) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_5, __pyx_n_s_rfname) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_n_s_rfname); __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 474, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 488, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_v_name = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":475 + /* "kivyblocks/blocks.pyx":489 * rf = RegisterFunction() * name = desc.get('rfname') * func = rf.get(name) # <<<<<<<<<<<<<< * if func is None: * Logger.info('Block: desc=%s rfname(%s) not found', */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_rf, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 475, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_rf, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 489, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_5 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { @@ -17120,13 +17388,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_44registedfunctionAction( } __pyx_t_1 = (__pyx_t_5) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_5, __pyx_v_name) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_v_name); __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 475, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 489, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_v_func = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":476 + /* "kivyblocks/blocks.pyx":490 * name = desc.get('rfname') * func = rf.get(name) * if func is None: # <<<<<<<<<<<<<< @@ -17137,27 +17405,27 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_44registedfunctionAction( __pyx_t_7 = (__pyx_t_6 != 0); if (unlikely(__pyx_t_7)) { - /* "kivyblocks/blocks.pyx":477 + /* "kivyblocks/blocks.pyx":491 * func = rf.get(name) * if func is None: * Logger.info('Block: desc=%s rfname(%s) not found', # <<<<<<<<<<<<<< * str(desc), name) * raise Exception('rfname(%s) not found' % name) */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Logger); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 477, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Logger); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 491, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_info); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 477, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_info); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 491, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":478 + /* "kivyblocks/blocks.pyx":492 * if func is None: * Logger.info('Block: desc=%s rfname(%s) not found', * str(desc), name) # <<<<<<<<<<<<<< * raise Exception('rfname(%s) not found' % name) * */ - __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyString_Type)), __pyx_v_desc); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 478, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyString_Type)), __pyx_v_desc); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 492, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = NULL; __pyx_t_4 = 0; @@ -17174,7 +17442,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_44registedfunctionAction( #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_5)) { PyObject *__pyx_temp[4] = {__pyx_t_3, __pyx_kp_s_Block_desc_s_rfname_s_not_found, __pyx_t_2, __pyx_v_name}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_4, 3+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 477, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_4, 3+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 491, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; @@ -17183,14 +17451,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_44registedfunctionAction( #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) { PyObject *__pyx_temp[4] = {__pyx_t_3, __pyx_kp_s_Block_desc_s_rfname_s_not_found, __pyx_t_2, __pyx_v_name}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_4, 3+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 477, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_4, 3+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 491, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } else #endif { - __pyx_t_8 = PyTuple_New(3+__pyx_t_4); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 477, __pyx_L1_error) + __pyx_t_8 = PyTuple_New(3+__pyx_t_4); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 491, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); if (__pyx_t_3) { __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_3); __pyx_t_3 = NULL; @@ -17204,30 +17472,30 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_44registedfunctionAction( __Pyx_GIVEREF(__pyx_v_name); PyTuple_SET_ITEM(__pyx_t_8, 2+__pyx_t_4, __pyx_v_name); __pyx_t_2 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_8, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 477, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_8, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 491, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; } __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":479 + /* "kivyblocks/blocks.pyx":493 * Logger.info('Block: desc=%s rfname(%s) not found', * str(desc), name) * raise Exception('rfname(%s) not found' % name) # <<<<<<<<<<<<<< * * params = desc.get('params',{}).copy() */ - __pyx_t_1 = __Pyx_PyString_FormatSafe(__pyx_kp_s_rfname_s_not_found, __pyx_v_name); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 479, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyString_FormatSafe(__pyx_kp_s_rfname_s_not_found, __pyx_v_name); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 493, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_5 = __Pyx_PyObject_CallOneArg(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])), __pyx_t_1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 479, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_CallOneArg(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])), __pyx_t_1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 493, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_Raise(__pyx_t_5, 0, 0, 0); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __PYX_ERR(0, 479, __pyx_L1_error) + __PYX_ERR(0, 493, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":476 + /* "kivyblocks/blocks.pyx":490 * name = desc.get('rfname') * func = rf.get(name) * if func is None: # <<<<<<<<<<<<<< @@ -17236,16 +17504,16 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_44registedfunctionAction( */ } - /* "kivyblocks/blocks.pyx":481 + /* "kivyblocks/blocks.pyx":495 * raise Exception('rfname(%s) not found' % name) * * params = desc.get('params',{}).copy() # <<<<<<<<<<<<<< * d = self.getActionData(widget,desc, *args) * if d: */ - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 481, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 495, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); - __pyx_t_2 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 481, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 495, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = NULL; __pyx_t_4 = 0; @@ -17262,7 +17530,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_44registedfunctionAction( #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_8)) { PyObject *__pyx_temp[3] = {__pyx_t_3, __pyx_n_s_params, __pyx_t_2}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 481, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 495, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; @@ -17271,14 +17539,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_44registedfunctionAction( #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_8)) { PyObject *__pyx_temp[3] = {__pyx_t_3, __pyx_n_s_params, __pyx_t_2}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 481, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 495, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } else #endif { - __pyx_t_9 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 481, __pyx_L1_error) + __pyx_t_9 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 495, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_9); if (__pyx_t_3) { __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_3); __pyx_t_3 = NULL; @@ -17289,12 +17557,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_44registedfunctionAction( __Pyx_GIVEREF(__pyx_t_2); PyTuple_SET_ITEM(__pyx_t_9, 1+__pyx_t_4, __pyx_t_2); __pyx_t_2 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_9, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 481, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_9, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 495, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; } __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_copy); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 481, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_copy); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 495, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_t_1 = NULL; @@ -17309,22 +17577,22 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_44registedfunctionAction( } __pyx_t_5 = (__pyx_t_1) ? __Pyx_PyObject_CallOneArg(__pyx_t_8, __pyx_t_1) : __Pyx_PyObject_CallNoArg(__pyx_t_8); __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 481, __pyx_L1_error) + if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 495, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __pyx_v_params = __pyx_t_5; __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":482 + /* "kivyblocks/blocks.pyx":496 * * params = desc.get('params',{}).copy() * d = self.getActionData(widget,desc, *args) # <<<<<<<<<<<<<< * if d: * params.update(d) */ - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_getActionData); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 482, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_getActionData); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 496, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_8 = PyTuple_New(2); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 482, __pyx_L1_error) + __pyx_t_8 = PyTuple_New(2); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 496, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_INCREF(__pyx_v_widget); __Pyx_GIVEREF(__pyx_v_widget); @@ -17332,34 +17600,34 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_44registedfunctionAction( __Pyx_INCREF(__pyx_v_desc); __Pyx_GIVEREF(__pyx_v_desc); PyTuple_SET_ITEM(__pyx_t_8, 1, __pyx_v_desc); - __pyx_t_1 = PyNumber_Add(__pyx_t_8, __pyx_v_args); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 482, __pyx_L1_error) + __pyx_t_1 = PyNumber_Add(__pyx_t_8, __pyx_v_args); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 496, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_1, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 482, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_1, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 496, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_d = __pyx_t_8; __pyx_t_8 = 0; - /* "kivyblocks/blocks.pyx":483 + /* "kivyblocks/blocks.pyx":497 * params = desc.get('params',{}).copy() * d = self.getActionData(widget,desc, *args) * if d: # <<<<<<<<<<<<<< * params.update(d) * func(target, *args, **params) */ - __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_v_d); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 483, __pyx_L1_error) + __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_v_d); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 497, __pyx_L1_error) if (__pyx_t_7) { - /* "kivyblocks/blocks.pyx":484 + /* "kivyblocks/blocks.pyx":498 * d = self.getActionData(widget,desc, *args) * if d: * params.update(d) # <<<<<<<<<<<<<< * func(target, *args, **params) * */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_params, __pyx_n_s_update); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 484, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_params, __pyx_n_s_update); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 498, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_t_5 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_1))) { @@ -17373,12 +17641,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_44registedfunctionAction( } __pyx_t_8 = (__pyx_t_5) ? __Pyx_PyObject_Call2Args(__pyx_t_1, __pyx_t_5, __pyx_v_d) : __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_v_d); __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 484, __pyx_L1_error) + if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 498, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "kivyblocks/blocks.pyx":483 + /* "kivyblocks/blocks.pyx":497 * params = desc.get('params',{}).copy() * d = self.getActionData(widget,desc, *args) * if d: # <<<<<<<<<<<<<< @@ -17387,39 +17655,39 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_44registedfunctionAction( */ } - /* "kivyblocks/blocks.pyx":485 + /* "kivyblocks/blocks.pyx":499 * if d: * params.update(d) * func(target, *args, **params) # <<<<<<<<<<<<<< * * def scriptAction(self, widget:Widget, desc, *args): */ - __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 485, __pyx_L1_error) + __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 499, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_INCREF(__pyx_v_target); __Pyx_GIVEREF(__pyx_v_target); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_v_target); - __pyx_t_1 = PyNumber_Add(__pyx_t_8, __pyx_v_args); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 485, __pyx_L1_error) + __pyx_t_1 = PyNumber_Add(__pyx_t_8, __pyx_v_args); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 499, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; if (unlikely(__pyx_v_params == Py_None)) { PyErr_SetString(PyExc_TypeError, "argument after ** must be a mapping, not NoneType"); - __PYX_ERR(0, 485, __pyx_L1_error) + __PYX_ERR(0, 499, __pyx_L1_error) } if (likely(PyDict_CheckExact(__pyx_v_params))) { - __pyx_t_8 = PyDict_Copy(__pyx_v_params); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 485, __pyx_L1_error) + __pyx_t_8 = PyDict_Copy(__pyx_v_params); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 499, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); } else { - __pyx_t_8 = PyObject_CallFunctionObjArgs((PyObject*)&PyDict_Type, __pyx_v_params, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 485, __pyx_L1_error) + __pyx_t_8 = PyObject_CallFunctionObjArgs((PyObject*)&PyDict_Type, __pyx_v_params, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 499, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); } - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_v_func, __pyx_t_1, __pyx_t_8); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 485, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_Call(__pyx_v_func, __pyx_t_1, __pyx_t_8); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 499, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":471 + /* "kivyblocks/blocks.pyx":485 * return data * * def registedfunctionAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< @@ -17451,7 +17719,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_44registedfunctionAction( return __pyx_r; } -/* "kivyblocks/blocks.pyx":487 +/* "kivyblocks/blocks.pyx":501 * func(target, *args, **params) * * def scriptAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< @@ -17508,18 +17776,18 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_47scriptAction(PyObject * case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_widget)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("scriptAction", 0, 3, 3, 1); __PYX_ERR(0, 487, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("scriptAction", 0, 3, 3, 1); __PYX_ERR(0, 501, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: if (likely((values[2] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_desc)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("scriptAction", 0, 3, 3, 2); __PYX_ERR(0, 487, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("scriptAction", 0, 3, 3, 2); __PYX_ERR(0, 501, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { const Py_ssize_t used_pos_args = (pos_args < 3) ? pos_args : 3; - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, used_pos_args, "scriptAction") < 0)) __PYX_ERR(0, 487, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, used_pos_args, "scriptAction") < 0)) __PYX_ERR(0, 501, __pyx_L3_error) } } else if (PyTuple_GET_SIZE(__pyx_args) < 3) { goto __pyx_L5_argtuple_error; @@ -17534,7 +17802,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_47scriptAction(PyObject * } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("scriptAction", 0, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 487, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("scriptAction", 0, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 501, __pyx_L3_error) __pyx_L3_error:; __Pyx_DECREF(__pyx_v_args); __pyx_v_args = 0; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.scriptAction", __pyx_clineno, __pyx_lineno, __pyx_filename); @@ -17574,14 +17842,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_46scriptAction(CYTHON_UNU int __pyx_clineno = 0; __Pyx_RefNannySetupContext("scriptAction", 0); - /* "kivyblocks/blocks.pyx":488 + /* "kivyblocks/blocks.pyx":502 * * def scriptAction(self, widget:Widget, desc, *args): * script = desc.get('script') # <<<<<<<<<<<<<< * if not script: * Logger.info('Block: scriptAction():desc(%s) target not found', */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 488, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 502, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { @@ -17595,44 +17863,44 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_46scriptAction(CYTHON_UNU } __pyx_t_1 = (__pyx_t_3) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_3, __pyx_n_s_script_2) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_n_s_script_2); __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 488, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 502, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_v_script = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":489 + /* "kivyblocks/blocks.pyx":503 * def scriptAction(self, widget:Widget, desc, *args): * script = desc.get('script') * if not script: # <<<<<<<<<<<<<< * Logger.info('Block: scriptAction():desc(%s) target not found', * str(desc)) */ - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_v_script); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 489, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_v_script); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 503, __pyx_L1_error) __pyx_t_5 = ((!__pyx_t_4) != 0); if (__pyx_t_5) { - /* "kivyblocks/blocks.pyx":490 + /* "kivyblocks/blocks.pyx":504 * script = desc.get('script') * if not script: * Logger.info('Block: scriptAction():desc(%s) target not found', # <<<<<<<<<<<<<< * str(desc)) * return */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Logger); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 490, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Logger); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 504, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_info); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 490, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_info); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 504, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":491 + /* "kivyblocks/blocks.pyx":505 * if not script: * Logger.info('Block: scriptAction():desc(%s) target not found', * str(desc)) # <<<<<<<<<<<<<< * return * target = self.get_target(widget, desc) */ - __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyString_Type)), __pyx_v_desc); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 491, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyString_Type)), __pyx_v_desc); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 505, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_6 = NULL; __pyx_t_7 = 0; @@ -17649,7 +17917,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_46scriptAction(CYTHON_UNU #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_3)) { PyObject *__pyx_temp[3] = {__pyx_t_6, __pyx_kp_s_Block_scriptAction_desc_s_target, __pyx_t_2}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 490, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 504, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; @@ -17658,14 +17926,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_46scriptAction(CYTHON_UNU #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_3)) { PyObject *__pyx_temp[3] = {__pyx_t_6, __pyx_kp_s_Block_scriptAction_desc_s_target, __pyx_t_2}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 490, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 504, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } else #endif { - __pyx_t_8 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 490, __pyx_L1_error) + __pyx_t_8 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 504, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); if (__pyx_t_6) { __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_6); __pyx_t_6 = NULL; @@ -17676,14 +17944,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_46scriptAction(CYTHON_UNU __Pyx_GIVEREF(__pyx_t_2); PyTuple_SET_ITEM(__pyx_t_8, 1+__pyx_t_7, __pyx_t_2); __pyx_t_2 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_8, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 490, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_8, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 504, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; } __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":492 + /* "kivyblocks/blocks.pyx":506 * Logger.info('Block: scriptAction():desc(%s) target not found', * str(desc)) * return # <<<<<<<<<<<<<< @@ -17694,7 +17962,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_46scriptAction(CYTHON_UNU __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "kivyblocks/blocks.pyx":489 + /* "kivyblocks/blocks.pyx":503 * def scriptAction(self, widget:Widget, desc, *args): * script = desc.get('script') * if not script: # <<<<<<<<<<<<<< @@ -17703,14 +17971,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_46scriptAction(CYTHON_UNU */ } - /* "kivyblocks/blocks.pyx":493 + /* "kivyblocks/blocks.pyx":507 * str(desc)) * return * target = self.get_target(widget, desc) # <<<<<<<<<<<<<< * d = self.getActionData(widget,desc, *args) * ns = { */ - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_get_target); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 493, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_get_target); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 507, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_8 = NULL; __pyx_t_7 = 0; @@ -17727,7 +17995,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_46scriptAction(CYTHON_UNU #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_3)) { PyObject *__pyx_temp[3] = {__pyx_t_8, __pyx_v_widget, __pyx_v_desc}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 493, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 507, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_GOTREF(__pyx_t_1); } else @@ -17735,13 +18003,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_46scriptAction(CYTHON_UNU #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_3)) { PyObject *__pyx_temp[3] = {__pyx_t_8, __pyx_v_widget, __pyx_v_desc}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 493, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 507, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_GOTREF(__pyx_t_1); } else #endif { - __pyx_t_2 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 493, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 507, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); if (__pyx_t_8) { __Pyx_GIVEREF(__pyx_t_8); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_8); __pyx_t_8 = NULL; @@ -17752,7 +18020,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_46scriptAction(CYTHON_UNU __Pyx_INCREF(__pyx_v_desc); __Pyx_GIVEREF(__pyx_v_desc); PyTuple_SET_ITEM(__pyx_t_2, 1+__pyx_t_7, __pyx_v_desc); - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 493, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 507, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } @@ -17760,16 +18028,16 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_46scriptAction(CYTHON_UNU __pyx_v_target = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":494 + /* "kivyblocks/blocks.pyx":508 * return * target = self.get_target(widget, desc) * d = self.getActionData(widget,desc, *args) # <<<<<<<<<<<<<< * ns = { * "self":target, */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_getActionData); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 494, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_getActionData); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 508, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 494, __pyx_L1_error) + __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 508, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_INCREF(__pyx_v_widget); __Pyx_GIVEREF(__pyx_v_widget); @@ -17777,69 +18045,69 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_46scriptAction(CYTHON_UNU __Pyx_INCREF(__pyx_v_desc); __Pyx_GIVEREF(__pyx_v_desc); PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_v_desc); - __pyx_t_2 = PyNumber_Add(__pyx_t_3, __pyx_v_args); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 494, __pyx_L1_error) + __pyx_t_2 = PyNumber_Add(__pyx_t_3, __pyx_v_args); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 508, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 494, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 508, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_v_d = __pyx_t_3; __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":496 + /* "kivyblocks/blocks.pyx":510 * d = self.getActionData(widget,desc, *args) * ns = { * "self":target, # <<<<<<<<<<<<<< * "args":args, * "kwargs":d */ - __pyx_t_3 = __Pyx_PyDict_NewPresized(3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 496, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyDict_NewPresized(3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 510, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_self, __pyx_v_target) < 0) __PYX_ERR(0, 496, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_self, __pyx_v_target) < 0) __PYX_ERR(0, 510, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":497 + /* "kivyblocks/blocks.pyx":511 * ns = { * "self":target, * "args":args, # <<<<<<<<<<<<<< * "kwargs":d * } */ - if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_args, __pyx_v_args) < 0) __PYX_ERR(0, 496, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_args, __pyx_v_args) < 0) __PYX_ERR(0, 510, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":498 + /* "kivyblocks/blocks.pyx":512 * "self":target, * "args":args, * "kwargs":d # <<<<<<<<<<<<<< * } * if d: */ - if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_kwargs, __pyx_v_d) < 0) __PYX_ERR(0, 496, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_kwargs, __pyx_v_d) < 0) __PYX_ERR(0, 510, __pyx_L1_error) __pyx_v_ns = ((PyObject*)__pyx_t_3); __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":500 + /* "kivyblocks/blocks.pyx":514 * "kwargs":d * } * if d: # <<<<<<<<<<<<<< * ns.update(d) * try: */ - __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_v_d); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 500, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_v_d); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 514, __pyx_L1_error) if (__pyx_t_5) { - /* "kivyblocks/blocks.pyx":501 + /* "kivyblocks/blocks.pyx":515 * } * if d: * ns.update(d) # <<<<<<<<<<<<<< * try: * self.eval(script, ns) */ - __pyx_t_3 = __Pyx_CallUnboundCMethod1(&__pyx_umethod_PyDict_Type_update, __pyx_v_ns, __pyx_v_d); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 501, __pyx_L1_error) + __pyx_t_3 = __Pyx_CallUnboundCMethod1(&__pyx_umethod_PyDict_Type_update, __pyx_v_ns, __pyx_v_d); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 515, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":500 + /* "kivyblocks/blocks.pyx":514 * "kwargs":d * } * if d: # <<<<<<<<<<<<<< @@ -17848,7 +18116,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_46scriptAction(CYTHON_UNU */ } - /* "kivyblocks/blocks.pyx":502 + /* "kivyblocks/blocks.pyx":516 * if d: * ns.update(d) * try: # <<<<<<<<<<<<<< @@ -17864,14 +18132,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_46scriptAction(CYTHON_UNU __Pyx_XGOTREF(__pyx_t_11); /*try:*/ { - /* "kivyblocks/blocks.pyx":503 + /* "kivyblocks/blocks.pyx":517 * ns.update(d) * try: * self.eval(script, ns) # <<<<<<<<<<<<<< * except Exception as e: * print_exc() */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_eval); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 503, __pyx_L5_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_eval); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 517, __pyx_L5_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_1 = NULL; __pyx_t_7 = 0; @@ -17888,7 +18156,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_46scriptAction(CYTHON_UNU #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_2)) { PyObject *__pyx_temp[3] = {__pyx_t_1, __pyx_v_script, __pyx_v_ns}; - __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 503, __pyx_L5_error) + __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 517, __pyx_L5_error) __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_GOTREF(__pyx_t_3); } else @@ -17896,13 +18164,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_46scriptAction(CYTHON_UNU #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_2)) { PyObject *__pyx_temp[3] = {__pyx_t_1, __pyx_v_script, __pyx_v_ns}; - __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 503, __pyx_L5_error) + __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 517, __pyx_L5_error) __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_GOTREF(__pyx_t_3); } else #endif { - __pyx_t_8 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 503, __pyx_L5_error) + __pyx_t_8 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 517, __pyx_L5_error) __Pyx_GOTREF(__pyx_t_8); if (__pyx_t_1) { __Pyx_GIVEREF(__pyx_t_1); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_1); __pyx_t_1 = NULL; @@ -17913,14 +18181,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_46scriptAction(CYTHON_UNU __Pyx_INCREF(__pyx_v_ns); __Pyx_GIVEREF(__pyx_v_ns); PyTuple_SET_ITEM(__pyx_t_8, 1+__pyx_t_7, __pyx_v_ns); - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_8, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 503, __pyx_L5_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_8, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 517, __pyx_L5_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; } __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":502 + /* "kivyblocks/blocks.pyx":516 * if d: * ns.update(d) * try: # <<<<<<<<<<<<<< @@ -17939,7 +18207,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_46scriptAction(CYTHON_UNU __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "kivyblocks/blocks.pyx":504 + /* "kivyblocks/blocks.pyx":518 * try: * self.eval(script, ns) * except Exception as e: # <<<<<<<<<<<<<< @@ -17949,21 +18217,21 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_46scriptAction(CYTHON_UNU __pyx_t_7 = __Pyx_PyErr_ExceptionMatches(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); if (__pyx_t_7) { __Pyx_AddTraceback("kivyblocks.blocks.Blocks.scriptAction", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_3, &__pyx_t_2, &__pyx_t_8) < 0) __PYX_ERR(0, 504, __pyx_L7_except_error) + if (__Pyx_GetException(&__pyx_t_3, &__pyx_t_2, &__pyx_t_8) < 0) __PYX_ERR(0, 518, __pyx_L7_except_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_GOTREF(__pyx_t_2); __Pyx_GOTREF(__pyx_t_8); __Pyx_INCREF(__pyx_t_2); __pyx_v_e = __pyx_t_2; - /* "kivyblocks/blocks.pyx":505 + /* "kivyblocks/blocks.pyx":519 * self.eval(script, ns) * except Exception as e: * print_exc() # <<<<<<<<<<<<<< * print(e) * */ - __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_print_exc); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 505, __pyx_L7_except_error) + __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_print_exc); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 519, __pyx_L7_except_error) __Pyx_GOTREF(__pyx_t_6); __pyx_t_12 = NULL; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_6))) { @@ -17977,19 +18245,19 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_46scriptAction(CYTHON_UNU } __pyx_t_1 = (__pyx_t_12) ? __Pyx_PyObject_CallOneArg(__pyx_t_6, __pyx_t_12) : __Pyx_PyObject_CallNoArg(__pyx_t_6); __Pyx_XDECREF(__pyx_t_12); __pyx_t_12 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 505, __pyx_L7_except_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 519, __pyx_L7_except_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":506 + /* "kivyblocks/blocks.pyx":520 * except Exception as e: * print_exc() * print(e) # <<<<<<<<<<<<<< * * def build_rtdesc(self, desc): */ - if (__Pyx_PrintOne(0, __pyx_v_e) < 0) __PYX_ERR(0, 506, __pyx_L7_except_error) + if (__Pyx_PrintOne(0, __pyx_v_e) < 0) __PYX_ERR(0, 520, __pyx_L7_except_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; @@ -17998,7 +18266,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_46scriptAction(CYTHON_UNU goto __pyx_L7_except_error; __pyx_L7_except_error:; - /* "kivyblocks/blocks.pyx":502 + /* "kivyblocks/blocks.pyx":516 * if d: * ns.update(d) * try: # <<<<<<<<<<<<<< @@ -18018,7 +18286,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_46scriptAction(CYTHON_UNU __pyx_L10_try_end:; } - /* "kivyblocks/blocks.pyx":487 + /* "kivyblocks/blocks.pyx":501 * func(target, *args, **params) * * def scriptAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< @@ -18049,7 +18317,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_46scriptAction(CYTHON_UNU return __pyx_r; } -/* "kivyblocks/blocks.pyx":508 +/* "kivyblocks/blocks.pyx":522 * print(e) * * def build_rtdesc(self, desc): # <<<<<<<<<<<<<< @@ -18092,11 +18360,11 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_49build_rtdesc(PyObject * case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_desc)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("build_rtdesc", 1, 2, 2, 1); __PYX_ERR(0, 508, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("build_rtdesc", 1, 2, 2, 1); __PYX_ERR(0, 522, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "build_rtdesc") < 0)) __PYX_ERR(0, 508, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "build_rtdesc") < 0)) __PYX_ERR(0, 522, __pyx_L3_error) } } else if (PyTuple_GET_SIZE(__pyx_args) != 2) { goto __pyx_L5_argtuple_error; @@ -18109,7 +18377,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_49build_rtdesc(PyObject * } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("build_rtdesc", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 508, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("build_rtdesc", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 522, __pyx_L3_error) __pyx_L3_error:; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.build_rtdesc", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); @@ -18139,14 +18407,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_48build_rtdesc(CYTHON_UNU int __pyx_clineno = 0; __Pyx_RefNannySetupContext("build_rtdesc", 0); - /* "kivyblocks/blocks.pyx":509 + /* "kivyblocks/blocks.pyx":523 * * def build_rtdesc(self, desc): * rtdesc = desc.get('rtdata') # <<<<<<<<<<<<<< * if not rtdesc: * if desc.get('datawidget'): */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 509, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 523, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { @@ -18160,31 +18428,31 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_48build_rtdesc(CYTHON_UNU } __pyx_t_1 = (__pyx_t_3) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_3, __pyx_n_s_rtdata) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_n_s_rtdata); __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 509, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 523, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_v_rtdesc = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":510 + /* "kivyblocks/blocks.pyx":524 * def build_rtdesc(self, desc): * rtdesc = desc.get('rtdata') * if not rtdesc: # <<<<<<<<<<<<<< * if desc.get('datawidget'): * rtdesc = {} */ - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_v_rtdesc); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 510, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_v_rtdesc); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 524, __pyx_L1_error) __pyx_t_5 = ((!__pyx_t_4) != 0); if (__pyx_t_5) { - /* "kivyblocks/blocks.pyx":511 + /* "kivyblocks/blocks.pyx":525 * rtdesc = desc.get('rtdata') * if not rtdesc: * if desc.get('datawidget'): # <<<<<<<<<<<<<< * rtdesc = {} * rtdesc['target'] = desc['datawidget'] */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 511, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 525, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { @@ -18198,45 +18466,45 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_48build_rtdesc(CYTHON_UNU } __pyx_t_1 = (__pyx_t_3) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_3, __pyx_n_s_datawidget) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_n_s_datawidget); __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 511, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 525, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 511, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 525, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; if (__pyx_t_5) { - /* "kivyblocks/blocks.pyx":512 + /* "kivyblocks/blocks.pyx":526 * if not rtdesc: * if desc.get('datawidget'): * rtdesc = {} # <<<<<<<<<<<<<< * rtdesc['target'] = desc['datawidget'] * if desc.get('datascript'): */ - __pyx_t_1 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 512, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 526, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF_SET(__pyx_v_rtdesc, __pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":513 + /* "kivyblocks/blocks.pyx":527 * if desc.get('datawidget'): * rtdesc = {} * rtdesc['target'] = desc['datawidget'] # <<<<<<<<<<<<<< * if desc.get('datascript'): * rtdesc['script'] = desc.get('datacript') */ - __pyx_t_1 = __Pyx_PyObject_Dict_GetItem(__pyx_v_desc, __pyx_n_s_datawidget); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 513, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Dict_GetItem(__pyx_v_desc, __pyx_n_s_datawidget); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 527, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (unlikely(PyObject_SetItem(__pyx_v_rtdesc, __pyx_n_s_target, __pyx_t_1) < 0)) __PYX_ERR(0, 513, __pyx_L1_error) + if (unlikely(PyObject_SetItem(__pyx_v_rtdesc, __pyx_n_s_target, __pyx_t_1) < 0)) __PYX_ERR(0, 527, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":514 + /* "kivyblocks/blocks.pyx":528 * rtdesc = {} * rtdesc['target'] = desc['datawidget'] * if desc.get('datascript'): # <<<<<<<<<<<<<< * rtdesc['script'] = desc.get('datacript') * else: */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 514, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 528, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { @@ -18250,21 +18518,21 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_48build_rtdesc(CYTHON_UNU } __pyx_t_1 = (__pyx_t_3) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_3, __pyx_n_s_datascript) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_n_s_datascript); __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 514, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 528, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 514, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 528, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; if (__pyx_t_5) { - /* "kivyblocks/blocks.pyx":515 + /* "kivyblocks/blocks.pyx":529 * rtdesc['target'] = desc['datawidget'] * if desc.get('datascript'): * rtdesc['script'] = desc.get('datacript') # <<<<<<<<<<<<<< * else: * rtdesc['method'] = desc.get('datamethod', 'getValue') */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 515, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 529, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { @@ -18278,13 +18546,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_48build_rtdesc(CYTHON_UNU } __pyx_t_1 = (__pyx_t_3) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_3, __pyx_n_s_datacript) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_n_s_datacript); __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 515, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 529, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(PyObject_SetItem(__pyx_v_rtdesc, __pyx_n_s_script_2, __pyx_t_1) < 0)) __PYX_ERR(0, 515, __pyx_L1_error) + if (unlikely(PyObject_SetItem(__pyx_v_rtdesc, __pyx_n_s_script_2, __pyx_t_1) < 0)) __PYX_ERR(0, 529, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":514 + /* "kivyblocks/blocks.pyx":528 * rtdesc = {} * rtdesc['target'] = desc['datawidget'] * if desc.get('datascript'): # <<<<<<<<<<<<<< @@ -18294,34 +18562,34 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_48build_rtdesc(CYTHON_UNU goto __pyx_L5; } - /* "kivyblocks/blocks.pyx":517 + /* "kivyblocks/blocks.pyx":531 * rtdesc['script'] = desc.get('datacript') * else: * rtdesc['method'] = desc.get('datamethod', 'getValue') # <<<<<<<<<<<<<< * rtdesc['kwargs'] = desc.get('datakwargs', {}) - * else: + * return rtdesc */ /*else*/ { - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 517, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 531, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_tuple__19, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 517, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_tuple__19, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 531, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(PyObject_SetItem(__pyx_v_rtdesc, __pyx_n_s_method, __pyx_t_2) < 0)) __PYX_ERR(0, 517, __pyx_L1_error) + if (unlikely(PyObject_SetItem(__pyx_v_rtdesc, __pyx_n_s_method, __pyx_t_2) < 0)) __PYX_ERR(0, 531, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } __pyx_L5:; - /* "kivyblocks/blocks.pyx":518 + /* "kivyblocks/blocks.pyx":532 * else: * rtdesc['method'] = desc.get('datamethod', 'getValue') * rtdesc['kwargs'] = desc.get('datakwargs', {}) # <<<<<<<<<<<<<< - * else: - * return {} + * return rtdesc + * */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 518, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 532, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 518, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 532, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_6 = NULL; __pyx_t_7 = 0; @@ -18338,7 +18606,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_48build_rtdesc(CYTHON_UNU #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_1)) { PyObject *__pyx_temp[3] = {__pyx_t_6, __pyx_n_s_datakwargs, __pyx_t_3}; - __pyx_t_2 = __Pyx_PyFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 518, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 532, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -18347,14 +18615,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_48build_rtdesc(CYTHON_UNU #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_1)) { PyObject *__pyx_temp[3] = {__pyx_t_6, __pyx_n_s_datakwargs, __pyx_t_3}; - __pyx_t_2 = __Pyx_PyCFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 518, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyCFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 532, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } else #endif { - __pyx_t_8 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 518, __pyx_L1_error) + __pyx_t_8 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 532, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); if (__pyx_t_6) { __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_6); __pyx_t_6 = NULL; @@ -18365,42 +18633,24 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_48build_rtdesc(CYTHON_UNU __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_8, 1+__pyx_t_7, __pyx_t_3); __pyx_t_3 = 0; - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_8, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 518, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_8, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 532, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; } __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(PyObject_SetItem(__pyx_v_rtdesc, __pyx_n_s_kwargs, __pyx_t_2) < 0)) __PYX_ERR(0, 518, __pyx_L1_error) + if (unlikely(PyObject_SetItem(__pyx_v_rtdesc, __pyx_n_s_kwargs, __pyx_t_2) < 0)) __PYX_ERR(0, 532, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":511 + /* "kivyblocks/blocks.pyx":525 * rtdesc = desc.get('rtdata') * if not rtdesc: * if desc.get('datawidget'): # <<<<<<<<<<<<<< * rtdesc = {} * rtdesc['target'] = desc['datawidget'] */ - goto __pyx_L4; } - /* "kivyblocks/blocks.pyx":520 - * rtdesc['kwargs'] = desc.get('datakwargs', {}) - * else: - * return {} # <<<<<<<<<<<<<< - * return rtdesc - * - */ - /*else*/ { - __Pyx_XDECREF(__pyx_r); - __pyx_t_2 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 520, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __pyx_r = __pyx_t_2; - __pyx_t_2 = 0; - goto __pyx_L0; - } - __pyx_L4:; - - /* "kivyblocks/blocks.pyx":510 + /* "kivyblocks/blocks.pyx":524 * def build_rtdesc(self, desc): * rtdesc = desc.get('rtdata') * if not rtdesc: # <<<<<<<<<<<<<< @@ -18409,9 +18659,9 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_48build_rtdesc(CYTHON_UNU */ } - /* "kivyblocks/blocks.pyx":521 - * else: - * return {} + /* "kivyblocks/blocks.pyx":533 + * rtdesc['method'] = desc.get('datamethod', 'getValue') + * rtdesc['kwargs'] = desc.get('datakwargs', {}) * return rtdesc # <<<<<<<<<<<<<< * * def get_rtdata(self, widget:Widget, desc, *args): @@ -18421,7 +18671,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_48build_rtdesc(CYTHON_UNU __pyx_r = __pyx_v_rtdesc; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":508 + /* "kivyblocks/blocks.pyx":522 * print(e) * * def build_rtdesc(self, desc): # <<<<<<<<<<<<<< @@ -18445,7 +18695,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_48build_rtdesc(CYTHON_UNU return __pyx_r; } -/* "kivyblocks/blocks.pyx":523 +/* "kivyblocks/blocks.pyx":535 * return rtdesc * * def get_rtdata(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< @@ -18503,18 +18753,18 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_51get_rtdata(PyObject *__ case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_widget)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("get_rtdata", 0, 3, 3, 1); __PYX_ERR(0, 523, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("get_rtdata", 0, 3, 3, 1); __PYX_ERR(0, 535, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: if (likely((values[2] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_desc)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("get_rtdata", 0, 3, 3, 2); __PYX_ERR(0, 523, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("get_rtdata", 0, 3, 3, 2); __PYX_ERR(0, 535, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { const Py_ssize_t used_pos_args = (pos_args < 3) ? pos_args : 3; - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, used_pos_args, "get_rtdata") < 0)) __PYX_ERR(0, 523, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, used_pos_args, "get_rtdata") < 0)) __PYX_ERR(0, 535, __pyx_L3_error) } } else if (PyTuple_GET_SIZE(__pyx_args) < 3) { goto __pyx_L5_argtuple_error; @@ -18529,7 +18779,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_51get_rtdata(PyObject *__ } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("get_rtdata", 0, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 523, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("get_rtdata", 0, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 535, __pyx_L3_error) __pyx_L3_error:; __Pyx_DECREF(__pyx_v_args); __pyx_v_args = 0; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.get_rtdata", __pyx_clineno, __pyx_lineno, __pyx_filename); @@ -18575,7 +18825,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE int __pyx_clineno = 0; __Pyx_RefNannySetupContext("get_rtdata", 0); - /* "kivyblocks/blocks.pyx":534 + /* "kivyblocks/blocks.pyx":546 * """ * * if desc is None or desc == {}: # <<<<<<<<<<<<<< @@ -18589,26 +18839,26 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE __pyx_t_1 = __pyx_t_3; goto __pyx_L4_bool_binop_done; } - __pyx_t_4 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 534, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 546, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_5 = PyObject_RichCompare(__pyx_v_desc, __pyx_t_4, Py_EQ); __Pyx_XGOTREF(__pyx_t_5); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 534, __pyx_L1_error) + __pyx_t_5 = PyObject_RichCompare(__pyx_v_desc, __pyx_t_4, Py_EQ); __Pyx_XGOTREF(__pyx_t_5); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 546, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 534, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 546, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_t_1 = __pyx_t_3; __pyx_L4_bool_binop_done:; if (__pyx_t_1) { - /* "kivyblocks/blocks.pyx":535 + /* "kivyblocks/blocks.pyx":547 * * if desc is None or desc == {}: * print('get_rtdata():desc is None') # <<<<<<<<<<<<<< * return {} * kwargs = desc.get('kwargs', {}) */ - if (__Pyx_PrintOne(0, __pyx_kp_s_get_rtdata_desc_is_None) < 0) __PYX_ERR(0, 535, __pyx_L1_error) + if (__Pyx_PrintOne(0, __pyx_kp_s_get_rtdata_desc_is_None) < 0) __PYX_ERR(0, 547, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":536 + /* "kivyblocks/blocks.pyx":548 * if desc is None or desc == {}: * print('get_rtdata():desc is None') * return {} # <<<<<<<<<<<<<< @@ -18616,13 +18866,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE * if not isinstance(kwargs, dict): */ __Pyx_XDECREF(__pyx_r); - __pyx_t_5 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 536, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 548, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __pyx_r = __pyx_t_5; __pyx_t_5 = 0; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":534 + /* "kivyblocks/blocks.pyx":546 * """ * * if desc is None or desc == {}: # <<<<<<<<<<<<<< @@ -18631,16 +18881,16 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE */ } - /* "kivyblocks/blocks.pyx":537 + /* "kivyblocks/blocks.pyx":549 * print('get_rtdata():desc is None') * return {} * kwargs = desc.get('kwargs', {}) # <<<<<<<<<<<<<< * if not isinstance(kwargs, dict): * kwargs = {} */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 537, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 549, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_6 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 537, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 549, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __pyx_t_7 = NULL; __pyx_t_8 = 0; @@ -18657,7 +18907,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_4)) { PyObject *__pyx_temp[3] = {__pyx_t_7, __pyx_n_s_kwargs, __pyx_t_6}; - __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_8, 2+__pyx_t_8); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 537, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_8, 2+__pyx_t_8); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 549, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; @@ -18666,14 +18916,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) { PyObject *__pyx_temp[3] = {__pyx_t_7, __pyx_n_s_kwargs, __pyx_t_6}; - __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_8, 2+__pyx_t_8); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 537, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_8, 2+__pyx_t_8); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 549, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; } else #endif { - __pyx_t_9 = PyTuple_New(2+__pyx_t_8); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 537, __pyx_L1_error) + __pyx_t_9 = PyTuple_New(2+__pyx_t_8); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 549, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_9); if (__pyx_t_7) { __Pyx_GIVEREF(__pyx_t_7); PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_7); __pyx_t_7 = NULL; @@ -18684,7 +18934,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_9, 1+__pyx_t_8, __pyx_t_6); __pyx_t_6 = 0; - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_9, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 537, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_9, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 549, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; } @@ -18692,7 +18942,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE __pyx_v_kwargs = __pyx_t_5; __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":538 + /* "kivyblocks/blocks.pyx":550 * return {} * kwargs = desc.get('kwargs', {}) * if not isinstance(kwargs, dict): # <<<<<<<<<<<<<< @@ -18703,19 +18953,19 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE __pyx_t_3 = ((!(__pyx_t_1 != 0)) != 0); if (__pyx_t_3) { - /* "kivyblocks/blocks.pyx":539 + /* "kivyblocks/blocks.pyx":551 * kwargs = desc.get('kwargs', {}) * if not isinstance(kwargs, dict): * kwargs = {} # <<<<<<<<<<<<<< * w = None * if len(args) > 0: */ - __pyx_t_5 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 539, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 551, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF_SET(__pyx_v_kwargs, __pyx_t_5); __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":538 + /* "kivyblocks/blocks.pyx":550 * return {} * kwargs = desc.get('kwargs', {}) * if not isinstance(kwargs, dict): # <<<<<<<<<<<<<< @@ -18724,7 +18974,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE */ } - /* "kivyblocks/blocks.pyx":540 + /* "kivyblocks/blocks.pyx":552 * if not isinstance(kwargs, dict): * kwargs = {} * w = None # <<<<<<<<<<<<<< @@ -18734,30 +18984,30 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE __Pyx_INCREF(Py_None); __pyx_v_w = Py_None; - /* "kivyblocks/blocks.pyx":541 + /* "kivyblocks/blocks.pyx":553 * kwargs = {} * w = None * if len(args) > 0: # <<<<<<<<<<<<<< * w = args[0] * target = desc.get('target') */ - __pyx_t_10 = PyTuple_GET_SIZE(__pyx_v_args); if (unlikely(__pyx_t_10 == ((Py_ssize_t)-1))) __PYX_ERR(0, 541, __pyx_L1_error) + __pyx_t_10 = PyTuple_GET_SIZE(__pyx_v_args); if (unlikely(__pyx_t_10 == ((Py_ssize_t)-1))) __PYX_ERR(0, 553, __pyx_L1_error) __pyx_t_3 = ((__pyx_t_10 > 0) != 0); if (__pyx_t_3) { - /* "kivyblocks/blocks.pyx":542 + /* "kivyblocks/blocks.pyx":554 * w = None * if len(args) > 0: * w = args[0] # <<<<<<<<<<<<<< * target = desc.get('target') * if target: */ - __pyx_t_5 = __Pyx_GetItemInt_Tuple(__pyx_v_args, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 542, __pyx_L1_error) + __pyx_t_5 = __Pyx_GetItemInt_Tuple(__pyx_v_args, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 554, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF_SET(__pyx_v_w, __pyx_t_5); __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":541 + /* "kivyblocks/blocks.pyx":553 * kwargs = {} * w = None * if len(args) > 0: # <<<<<<<<<<<<<< @@ -18766,14 +19016,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE */ } - /* "kivyblocks/blocks.pyx":543 + /* "kivyblocks/blocks.pyx":555 * if len(args) > 0: * w = args[0] * target = desc.get('target') # <<<<<<<<<<<<<< * if target: * w = self.getWidgetById(target, from_widget=widget) */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 543, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 555, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __pyx_t_9 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_4))) { @@ -18787,40 +19037,40 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE } __pyx_t_5 = (__pyx_t_9) ? __Pyx_PyObject_Call2Args(__pyx_t_4, __pyx_t_9, __pyx_n_s_target) : __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_n_s_target); __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; - if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 543, __pyx_L1_error) + if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 555, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __pyx_v_target = __pyx_t_5; __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":544 + /* "kivyblocks/blocks.pyx":556 * w = args[0] * target = desc.get('target') * if target: # <<<<<<<<<<<<<< * w = self.getWidgetById(target, from_widget=widget) * if w is None: */ - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_target); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 544, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_target); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 556, __pyx_L1_error) if (__pyx_t_3) { - /* "kivyblocks/blocks.pyx":545 + /* "kivyblocks/blocks.pyx":557 * target = desc.get('target') * if target: * w = self.getWidgetById(target, from_widget=widget) # <<<<<<<<<<<<<< * if w is None: * print('get_rtdata():w is None', desc) */ - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_getWidgetById); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 545, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_getWidgetById); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 557, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 545, __pyx_L1_error) + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 557, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_INCREF(__pyx_v_target); __Pyx_GIVEREF(__pyx_v_target); PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_v_target); - __pyx_t_9 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 545, __pyx_L1_error) + __pyx_t_9 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 557, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_9); - if (PyDict_SetItem(__pyx_t_9, __pyx_n_s_from_widget, __pyx_v_widget) < 0) __PYX_ERR(0, 545, __pyx_L1_error) - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_4, __pyx_t_9); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 545, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_9, __pyx_n_s_from_widget, __pyx_v_widget) < 0) __PYX_ERR(0, 557, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_4, __pyx_t_9); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 557, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; @@ -18828,7 +19078,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE __Pyx_DECREF_SET(__pyx_v_w, __pyx_t_6); __pyx_t_6 = 0; - /* "kivyblocks/blocks.pyx":544 + /* "kivyblocks/blocks.pyx":556 * w = args[0] * target = desc.get('target') * if target: # <<<<<<<<<<<<<< @@ -18837,7 +19087,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE */ } - /* "kivyblocks/blocks.pyx":546 + /* "kivyblocks/blocks.pyx":558 * if target: * w = self.getWidgetById(target, from_widget=widget) * if w is None: # <<<<<<<<<<<<<< @@ -18848,14 +19098,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE __pyx_t_1 = (__pyx_t_3 != 0); if (__pyx_t_1) { - /* "kivyblocks/blocks.pyx":547 + /* "kivyblocks/blocks.pyx":559 * w = self.getWidgetById(target, from_widget=widget) * if w is None: * print('get_rtdata():w is None', desc) # <<<<<<<<<<<<<< * return {} * script = desc.get('script') */ - __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 547, __pyx_L1_error) + __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 559, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_INCREF(__pyx_kp_s_get_rtdata_w_is_None); __Pyx_GIVEREF(__pyx_kp_s_get_rtdata_w_is_None); @@ -18863,10 +19113,10 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE __Pyx_INCREF(__pyx_v_desc); __Pyx_GIVEREF(__pyx_v_desc); PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_v_desc); - if (__Pyx_PrintOne(0, __pyx_t_6) < 0) __PYX_ERR(0, 547, __pyx_L1_error) + if (__Pyx_PrintOne(0, __pyx_t_6) < 0) __PYX_ERR(0, 559, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - /* "kivyblocks/blocks.pyx":548 + /* "kivyblocks/blocks.pyx":560 * if w is None: * print('get_rtdata():w is None', desc) * return {} # <<<<<<<<<<<<<< @@ -18874,13 +19124,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE * if script: */ __Pyx_XDECREF(__pyx_r); - __pyx_t_6 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 548, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 560, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __pyx_r = __pyx_t_6; __pyx_t_6 = 0; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":546 + /* "kivyblocks/blocks.pyx":558 * if target: * w = self.getWidgetById(target, from_widget=widget) * if w is None: # <<<<<<<<<<<<<< @@ -18889,14 +19139,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE */ } - /* "kivyblocks/blocks.pyx":549 + /* "kivyblocks/blocks.pyx":561 * print('get_rtdata():w is None', desc) * return {} * script = desc.get('script') # <<<<<<<<<<<<<< * if script: * ns = { */ - __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 549, __pyx_L1_error) + __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 561, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_9); __pyx_t_4 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_9))) { @@ -18910,61 +19160,61 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE } __pyx_t_6 = (__pyx_t_4) ? __Pyx_PyObject_Call2Args(__pyx_t_9, __pyx_t_4, __pyx_n_s_script_2) : __Pyx_PyObject_CallOneArg(__pyx_t_9, __pyx_n_s_script_2); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 549, __pyx_L1_error) + if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 561, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; __pyx_v_script = __pyx_t_6; __pyx_t_6 = 0; - /* "kivyblocks/blocks.pyx":550 + /* "kivyblocks/blocks.pyx":562 * return {} * script = desc.get('script') * if script: # <<<<<<<<<<<<<< * ns = { * "self":w, */ - __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_v_script); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 550, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_v_script); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 562, __pyx_L1_error) if (__pyx_t_1) { - /* "kivyblocks/blocks.pyx":552 + /* "kivyblocks/blocks.pyx":564 * if script: * ns = { * "self":w, # <<<<<<<<<<<<<< * "args":args, * "kwargs":kwargs */ - __pyx_t_6 = __Pyx_PyDict_NewPresized(3); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 552, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyDict_NewPresized(3); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 564, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_self, __pyx_v_w) < 0) __PYX_ERR(0, 552, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_self, __pyx_v_w) < 0) __PYX_ERR(0, 564, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":553 + /* "kivyblocks/blocks.pyx":565 * ns = { * "self":w, * "args":args, # <<<<<<<<<<<<<< * "kwargs":kwargs * } */ - if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_args, __pyx_v_args) < 0) __PYX_ERR(0, 552, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_args, __pyx_v_args) < 0) __PYX_ERR(0, 564, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":554 + /* "kivyblocks/blocks.pyx":566 * "self":w, * "args":args, * "kwargs":kwargs # <<<<<<<<<<<<<< * } * d = self.eval(script, ns) */ - if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_kwargs, __pyx_v_kwargs) < 0) __PYX_ERR(0, 552, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_kwargs, __pyx_v_kwargs) < 0) __PYX_ERR(0, 564, __pyx_L1_error) __pyx_v_ns = ((PyObject*)__pyx_t_6); __pyx_t_6 = 0; - /* "kivyblocks/blocks.pyx":556 + /* "kivyblocks/blocks.pyx":568 * "kwargs":kwargs * } * d = self.eval(script, ns) # <<<<<<<<<<<<<< * return d * */ - __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_eval); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 556, __pyx_L1_error) + __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_eval); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 568, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_9); __pyx_t_4 = NULL; __pyx_t_8 = 0; @@ -18981,7 +19231,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_9)) { PyObject *__pyx_temp[3] = {__pyx_t_4, __pyx_v_script, __pyx_v_ns}; - __pyx_t_6 = __Pyx_PyFunction_FastCall(__pyx_t_9, __pyx_temp+1-__pyx_t_8, 2+__pyx_t_8); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 556, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyFunction_FastCall(__pyx_t_9, __pyx_temp+1-__pyx_t_8, 2+__pyx_t_8); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 568, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_GOTREF(__pyx_t_6); } else @@ -18989,13 +19239,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_9)) { PyObject *__pyx_temp[3] = {__pyx_t_4, __pyx_v_script, __pyx_v_ns}; - __pyx_t_6 = __Pyx_PyCFunction_FastCall(__pyx_t_9, __pyx_temp+1-__pyx_t_8, 2+__pyx_t_8); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 556, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyCFunction_FastCall(__pyx_t_9, __pyx_temp+1-__pyx_t_8, 2+__pyx_t_8); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 568, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_GOTREF(__pyx_t_6); } else #endif { - __pyx_t_5 = PyTuple_New(2+__pyx_t_8); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 556, __pyx_L1_error) + __pyx_t_5 = PyTuple_New(2+__pyx_t_8); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 568, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); if (__pyx_t_4) { __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_4); __pyx_t_4 = NULL; @@ -19006,7 +19256,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE __Pyx_INCREF(__pyx_v_ns); __Pyx_GIVEREF(__pyx_v_ns); PyTuple_SET_ITEM(__pyx_t_5, 1+__pyx_t_8, __pyx_v_ns); - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_9, __pyx_t_5, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 556, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_9, __pyx_t_5, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 568, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; } @@ -19014,7 +19264,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE __pyx_v_d = __pyx_t_6; __pyx_t_6 = 0; - /* "kivyblocks/blocks.pyx":557 + /* "kivyblocks/blocks.pyx":569 * } * d = self.eval(script, ns) * return d # <<<<<<<<<<<<<< @@ -19026,7 +19276,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE __pyx_r = __pyx_v_d; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":550 + /* "kivyblocks/blocks.pyx":562 * return {} * script = desc.get('script') * if script: # <<<<<<<<<<<<<< @@ -19035,40 +19285,40 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE */ } - /* "kivyblocks/blocks.pyx":559 + /* "kivyblocks/blocks.pyx":571 * return d * * method = desc.get('method', 'getValue') # <<<<<<<<<<<<<< * if not hasattr(w, method): * print('get_rtdata():method is None', desc, type(w)) */ - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 559, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 571, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - __pyx_t_9 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_tuple__20, NULL); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 559, __pyx_L1_error) + __pyx_t_9 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_tuple__20, NULL); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 571, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_9); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; __pyx_v_method = __pyx_t_9; __pyx_t_9 = 0; - /* "kivyblocks/blocks.pyx":560 + /* "kivyblocks/blocks.pyx":572 * * method = desc.get('method', 'getValue') * if not hasattr(w, method): # <<<<<<<<<<<<<< * print('get_rtdata():method is None', desc, type(w)) * return {} */ - __pyx_t_1 = __Pyx_HasAttr(__pyx_v_w, __pyx_v_method); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 560, __pyx_L1_error) + __pyx_t_1 = __Pyx_HasAttr(__pyx_v_w, __pyx_v_method); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 572, __pyx_L1_error) __pyx_t_3 = ((!(__pyx_t_1 != 0)) != 0); if (__pyx_t_3) { - /* "kivyblocks/blocks.pyx":561 + /* "kivyblocks/blocks.pyx":573 * method = desc.get('method', 'getValue') * if not hasattr(w, method): * print('get_rtdata():method is None', desc, type(w)) # <<<<<<<<<<<<<< * return {} * f = getattr(w, method) */ - __pyx_t_9 = PyTuple_New(3); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 561, __pyx_L1_error) + __pyx_t_9 = PyTuple_New(3); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 573, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_9); __Pyx_INCREF(__pyx_kp_s_get_rtdata_method_is_None); __Pyx_GIVEREF(__pyx_kp_s_get_rtdata_method_is_None); @@ -19079,10 +19329,10 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE __Pyx_INCREF(((PyObject *)Py_TYPE(__pyx_v_w))); __Pyx_GIVEREF(((PyObject *)Py_TYPE(__pyx_v_w))); PyTuple_SET_ITEM(__pyx_t_9, 2, ((PyObject *)Py_TYPE(__pyx_v_w))); - if (__Pyx_PrintOne(0, __pyx_t_9) < 0) __PYX_ERR(0, 561, __pyx_L1_error) + if (__Pyx_PrintOne(0, __pyx_t_9) < 0) __PYX_ERR(0, 573, __pyx_L1_error) __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; - /* "kivyblocks/blocks.pyx":562 + /* "kivyblocks/blocks.pyx":574 * if not hasattr(w, method): * print('get_rtdata():method is None', desc, type(w)) * return {} # <<<<<<<<<<<<<< @@ -19090,13 +19340,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE * try: */ __Pyx_XDECREF(__pyx_r); - __pyx_t_9 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 562, __pyx_L1_error) + __pyx_t_9 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 574, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_9); __pyx_r = __pyx_t_9; __pyx_t_9 = 0; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":560 + /* "kivyblocks/blocks.pyx":572 * * method = desc.get('method', 'getValue') * if not hasattr(w, method): # <<<<<<<<<<<<<< @@ -19105,19 +19355,19 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE */ } - /* "kivyblocks/blocks.pyx":563 + /* "kivyblocks/blocks.pyx":575 * print('get_rtdata():method is None', desc, type(w)) * return {} * f = getattr(w, method) # <<<<<<<<<<<<<< * try: * r = f(**kwargs) */ - __pyx_t_9 = __Pyx_GetAttr(__pyx_v_w, __pyx_v_method); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 563, __pyx_L1_error) + __pyx_t_9 = __Pyx_GetAttr(__pyx_v_w, __pyx_v_method); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 575, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_9); __pyx_v_f = __pyx_t_9; __pyx_t_9 = 0; - /* "kivyblocks/blocks.pyx":564 + /* "kivyblocks/blocks.pyx":576 * return {} * f = getattr(w, method) * try: # <<<<<<<<<<<<<< @@ -19133,7 +19383,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE __Pyx_XGOTREF(__pyx_t_13); /*try:*/ { - /* "kivyblocks/blocks.pyx":565 + /* "kivyblocks/blocks.pyx":577 * f = getattr(w, method) * try: * r = f(**kwargs) # <<<<<<<<<<<<<< @@ -19142,22 +19392,22 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE */ if (unlikely(__pyx_v_kwargs == Py_None)) { PyErr_SetString(PyExc_TypeError, "argument after ** must be a mapping, not NoneType"); - __PYX_ERR(0, 565, __pyx_L12_error) + __PYX_ERR(0, 577, __pyx_L12_error) } if (likely(PyDict_CheckExact(__pyx_v_kwargs))) { - __pyx_t_9 = PyDict_Copy(__pyx_v_kwargs); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 565, __pyx_L12_error) + __pyx_t_9 = PyDict_Copy(__pyx_v_kwargs); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 577, __pyx_L12_error) __Pyx_GOTREF(__pyx_t_9); } else { - __pyx_t_9 = PyObject_CallFunctionObjArgs((PyObject*)&PyDict_Type, __pyx_v_kwargs, NULL); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 565, __pyx_L12_error) + __pyx_t_9 = PyObject_CallFunctionObjArgs((PyObject*)&PyDict_Type, __pyx_v_kwargs, NULL); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 577, __pyx_L12_error) __Pyx_GOTREF(__pyx_t_9); } - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_v_f, __pyx_empty_tuple, __pyx_t_9); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 565, __pyx_L12_error) + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_v_f, __pyx_empty_tuple, __pyx_t_9); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 577, __pyx_L12_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; __pyx_v_r = __pyx_t_6; __pyx_t_6 = 0; - /* "kivyblocks/blocks.pyx":566 + /* "kivyblocks/blocks.pyx":578 * try: * r = f(**kwargs) * if isinstance(r, dict): # <<<<<<<<<<<<<< @@ -19168,7 +19418,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE __pyx_t_1 = (__pyx_t_3 != 0); if (__pyx_t_1) { - /* "kivyblocks/blocks.pyx":567 + /* "kivyblocks/blocks.pyx":579 * r = f(**kwargs) * if isinstance(r, dict): * return r # <<<<<<<<<<<<<< @@ -19180,7 +19430,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE __pyx_r = __pyx_v_r; goto __pyx_L16_try_return; - /* "kivyblocks/blocks.pyx":566 + /* "kivyblocks/blocks.pyx":578 * try: * r = f(**kwargs) * if isinstance(r, dict): # <<<<<<<<<<<<<< @@ -19189,21 +19439,21 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE */ } - /* "kivyblocks/blocks.pyx":568 + /* "kivyblocks/blocks.pyx":580 * if isinstance(r, dict): * return r * if isinstance(r, DictObject): # <<<<<<<<<<<<<< * return r.to_dict() * print('get_rtdata():method return is not dict', desc, 'ret=', r, type(r)) */ - __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_DictObject); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 568, __pyx_L12_error) + __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_DictObject); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 580, __pyx_L12_error) __Pyx_GOTREF(__pyx_t_6); - __pyx_t_1 = PyObject_IsInstance(__pyx_v_r, __pyx_t_6); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 568, __pyx_L12_error) + __pyx_t_1 = PyObject_IsInstance(__pyx_v_r, __pyx_t_6); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 580, __pyx_L12_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; __pyx_t_3 = (__pyx_t_1 != 0); if (__pyx_t_3) { - /* "kivyblocks/blocks.pyx":569 + /* "kivyblocks/blocks.pyx":581 * return r * if isinstance(r, DictObject): * return r.to_dict() # <<<<<<<<<<<<<< @@ -19211,7 +19461,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE * return {} */ __Pyx_XDECREF(__pyx_r); - __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_v_r, __pyx_n_s_to_dict); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 569, __pyx_L12_error) + __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_v_r, __pyx_n_s_to_dict); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 581, __pyx_L12_error) __Pyx_GOTREF(__pyx_t_9); __pyx_t_5 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_9))) { @@ -19225,14 +19475,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE } __pyx_t_6 = (__pyx_t_5) ? __Pyx_PyObject_CallOneArg(__pyx_t_9, __pyx_t_5) : __Pyx_PyObject_CallNoArg(__pyx_t_9); __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 569, __pyx_L12_error) + if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 581, __pyx_L12_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; __pyx_r = __pyx_t_6; __pyx_t_6 = 0; goto __pyx_L16_try_return; - /* "kivyblocks/blocks.pyx":568 + /* "kivyblocks/blocks.pyx":580 * if isinstance(r, dict): * return r * if isinstance(r, DictObject): # <<<<<<<<<<<<<< @@ -19241,14 +19491,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE */ } - /* "kivyblocks/blocks.pyx":570 + /* "kivyblocks/blocks.pyx":582 * if isinstance(r, DictObject): * return r.to_dict() * print('get_rtdata():method return is not dict', desc, 'ret=', r, type(r)) # <<<<<<<<<<<<<< * return {} * except: */ - __pyx_t_6 = PyTuple_New(5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 570, __pyx_L12_error) + __pyx_t_6 = PyTuple_New(5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 582, __pyx_L12_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_INCREF(__pyx_kp_s_get_rtdata_method_return_is_not); __Pyx_GIVEREF(__pyx_kp_s_get_rtdata_method_return_is_not); @@ -19265,10 +19515,10 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE __Pyx_INCREF(((PyObject *)Py_TYPE(__pyx_v_r))); __Pyx_GIVEREF(((PyObject *)Py_TYPE(__pyx_v_r))); PyTuple_SET_ITEM(__pyx_t_6, 4, ((PyObject *)Py_TYPE(__pyx_v_r))); - if (__Pyx_PrintOne(0, __pyx_t_6) < 0) __PYX_ERR(0, 570, __pyx_L12_error) + if (__Pyx_PrintOne(0, __pyx_t_6) < 0) __PYX_ERR(0, 582, __pyx_L12_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - /* "kivyblocks/blocks.pyx":571 + /* "kivyblocks/blocks.pyx":583 * return r.to_dict() * print('get_rtdata():method return is not dict', desc, 'ret=', r, type(r)) * return {} # <<<<<<<<<<<<<< @@ -19276,13 +19526,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE * print_exc() */ __Pyx_XDECREF(__pyx_r); - __pyx_t_6 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 571, __pyx_L12_error) + __pyx_t_6 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 583, __pyx_L12_error) __Pyx_GOTREF(__pyx_t_6); __pyx_r = __pyx_t_6; __pyx_t_6 = 0; goto __pyx_L16_try_return; - /* "kivyblocks/blocks.pyx":564 + /* "kivyblocks/blocks.pyx":576 * return {} * f = getattr(w, method) * try: # <<<<<<<<<<<<<< @@ -19297,7 +19547,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; - /* "kivyblocks/blocks.pyx":572 + /* "kivyblocks/blocks.pyx":584 * print('get_rtdata():method return is not dict', desc, 'ret=', r, type(r)) * return {} * except: # <<<<<<<<<<<<<< @@ -19306,19 +19556,19 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE */ /*except:*/ { __Pyx_AddTraceback("kivyblocks.blocks.Blocks.get_rtdata", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_6, &__pyx_t_9, &__pyx_t_5) < 0) __PYX_ERR(0, 572, __pyx_L14_except_error) + if (__Pyx_GetException(&__pyx_t_6, &__pyx_t_9, &__pyx_t_5) < 0) __PYX_ERR(0, 584, __pyx_L14_except_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_GOTREF(__pyx_t_9); __Pyx_GOTREF(__pyx_t_5); - /* "kivyblocks/blocks.pyx":573 + /* "kivyblocks/blocks.pyx":585 * return {} * except: * print_exc() # <<<<<<<<<<<<<< * return {} * */ - __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_n_s_print_exc); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 573, __pyx_L14_except_error) + __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_n_s_print_exc); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 585, __pyx_L14_except_error) __Pyx_GOTREF(__pyx_t_7); __pyx_t_14 = NULL; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_7))) { @@ -19332,12 +19582,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE } __pyx_t_4 = (__pyx_t_14) ? __Pyx_PyObject_CallOneArg(__pyx_t_7, __pyx_t_14) : __Pyx_PyObject_CallNoArg(__pyx_t_7); __Pyx_XDECREF(__pyx_t_14); __pyx_t_14 = 0; - if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 573, __pyx_L14_except_error) + if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 585, __pyx_L14_except_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":574 + /* "kivyblocks/blocks.pyx":586 * except: * print_exc() * return {} # <<<<<<<<<<<<<< @@ -19345,7 +19595,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE * def methodAction(self, widget:Widget, desc, *args): */ __Pyx_XDECREF(__pyx_r); - __pyx_t_4 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 574, __pyx_L14_except_error) + __pyx_t_4 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 586, __pyx_L14_except_error) __Pyx_GOTREF(__pyx_t_4); __pyx_r = __pyx_t_4; __pyx_t_4 = 0; @@ -19356,7 +19606,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE } __pyx_L14_except_error:; - /* "kivyblocks/blocks.pyx":564 + /* "kivyblocks/blocks.pyx":576 * return {} * f = getattr(w, method) * try: # <<<<<<<<<<<<<< @@ -19382,7 +19632,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE goto __pyx_L0; } - /* "kivyblocks/blocks.pyx":523 + /* "kivyblocks/blocks.pyx":535 * return rtdesc * * def get_rtdata(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< @@ -19415,7 +19665,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_50get_rtdata(CYTHON_UNUSE return __pyx_r; } -/* "kivyblocks/blocks.pyx":576 +/* "kivyblocks/blocks.pyx":588 * return {} * * def methodAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< @@ -19472,18 +19722,18 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_53methodAction(PyObject * case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_widget)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("methodAction", 0, 3, 3, 1); __PYX_ERR(0, 576, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("methodAction", 0, 3, 3, 1); __PYX_ERR(0, 588, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: if (likely((values[2] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_desc)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("methodAction", 0, 3, 3, 2); __PYX_ERR(0, 576, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("methodAction", 0, 3, 3, 2); __PYX_ERR(0, 588, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { const Py_ssize_t used_pos_args = (pos_args < 3) ? pos_args : 3; - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, used_pos_args, "methodAction") < 0)) __PYX_ERR(0, 576, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, used_pos_args, "methodAction") < 0)) __PYX_ERR(0, 588, __pyx_L3_error) } } else if (PyTuple_GET_SIZE(__pyx_args) < 3) { goto __pyx_L5_argtuple_error; @@ -19498,7 +19748,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_53methodAction(PyObject * } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("methodAction", 0, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 576, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("methodAction", 0, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 588, __pyx_L3_error) __pyx_L3_error:; __Pyx_DECREF(__pyx_v_args); __pyx_v_args = 0; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.methodAction", __pyx_clineno, __pyx_lineno, __pyx_filename); @@ -19535,14 +19785,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU int __pyx_clineno = 0; __Pyx_RefNannySetupContext("methodAction", 0); - /* "kivyblocks/blocks.pyx":577 + /* "kivyblocks/blocks.pyx":589 * * def methodAction(self, widget:Widget, desc, *args): * method = desc.get('method') # <<<<<<<<<<<<<< * target = self.get_target(widget, desc) * if target is None: */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 577, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 589, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { @@ -19556,20 +19806,20 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU } __pyx_t_1 = (__pyx_t_3) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_3, __pyx_n_s_method) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_n_s_method); __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 577, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 589, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_v_method = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":578 + /* "kivyblocks/blocks.pyx":590 * def methodAction(self, widget:Widget, desc, *args): * method = desc.get('method') * target = self.get_target(widget, desc) # <<<<<<<<<<<<<< * if target is None: * Logger.info('Block: methodAction():desc(%s) target not found', */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_get_target); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 578, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_get_target); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 590, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = NULL; __pyx_t_4 = 0; @@ -19586,7 +19836,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_2)) { PyObject *__pyx_temp[3] = {__pyx_t_3, __pyx_v_widget, __pyx_v_desc}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 578, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 590, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_1); } else @@ -19594,13 +19844,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_2)) { PyObject *__pyx_temp[3] = {__pyx_t_3, __pyx_v_widget, __pyx_v_desc}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 578, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 590, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_1); } else #endif { - __pyx_t_5 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 578, __pyx_L1_error) + __pyx_t_5 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 590, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); if (__pyx_t_3) { __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_3); __pyx_t_3 = NULL; @@ -19611,7 +19861,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU __Pyx_INCREF(__pyx_v_desc); __Pyx_GIVEREF(__pyx_v_desc); PyTuple_SET_ITEM(__pyx_t_5, 1+__pyx_t_4, __pyx_v_desc); - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_5, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 578, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_5, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 590, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; } @@ -19619,7 +19869,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU __pyx_v_target = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":579 + /* "kivyblocks/blocks.pyx":591 * method = desc.get('method') * target = self.get_target(widget, desc) * if target is None: # <<<<<<<<<<<<<< @@ -19630,27 +19880,27 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU __pyx_t_7 = (__pyx_t_6 != 0); if (__pyx_t_7) { - /* "kivyblocks/blocks.pyx":580 + /* "kivyblocks/blocks.pyx":592 * target = self.get_target(widget, desc) * if target is None: * Logger.info('Block: methodAction():desc(%s) target not found', # <<<<<<<<<<<<<< * str(desc)) * return */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Logger); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 580, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Logger); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 592, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_info); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 580, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_info); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 592, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":581 + /* "kivyblocks/blocks.pyx":593 * if target is None: * Logger.info('Block: methodAction():desc(%s) target not found', * str(desc)) # <<<<<<<<<<<<<< * return * if method is None: */ - __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyString_Type)), __pyx_v_desc); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 581, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyString_Type)), __pyx_v_desc); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 593, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = NULL; __pyx_t_4 = 0; @@ -19667,7 +19917,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_5)) { PyObject *__pyx_temp[3] = {__pyx_t_3, __pyx_kp_s_Block_methodAction_desc_s_target, __pyx_t_2}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 580, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 592, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; @@ -19676,14 +19926,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) { PyObject *__pyx_temp[3] = {__pyx_t_3, __pyx_kp_s_Block_methodAction_desc_s_target, __pyx_t_2}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 580, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 592, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } else #endif { - __pyx_t_8 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 580, __pyx_L1_error) + __pyx_t_8 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 592, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); if (__pyx_t_3) { __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_3); __pyx_t_3 = NULL; @@ -19694,14 +19944,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU __Pyx_GIVEREF(__pyx_t_2); PyTuple_SET_ITEM(__pyx_t_8, 1+__pyx_t_4, __pyx_t_2); __pyx_t_2 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_8, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 580, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_8, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 592, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; } __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":582 + /* "kivyblocks/blocks.pyx":594 * Logger.info('Block: methodAction():desc(%s) target not found', * str(desc)) * return # <<<<<<<<<<<<<< @@ -19712,7 +19962,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "kivyblocks/blocks.pyx":579 + /* "kivyblocks/blocks.pyx":591 * method = desc.get('method') * target = self.get_target(widget, desc) * if target is None: # <<<<<<<<<<<<<< @@ -19721,7 +19971,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU */ } - /* "kivyblocks/blocks.pyx":583 + /* "kivyblocks/blocks.pyx":595 * str(desc)) * return * if method is None: # <<<<<<<<<<<<<< @@ -19732,27 +19982,27 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU __pyx_t_6 = (__pyx_t_7 != 0); if (__pyx_t_6) { - /* "kivyblocks/blocks.pyx":584 + /* "kivyblocks/blocks.pyx":596 * return * if method is None: * Logger.info('Block: methodAction():desc(%s) method not found', # <<<<<<<<<<<<<< * str(desc)) * return */ - __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_Logger); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 584, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_Logger); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 596, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_info); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 584, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_info); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 596, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":585 + /* "kivyblocks/blocks.pyx":597 * if method is None: * Logger.info('Block: methodAction():desc(%s) method not found', * str(desc)) # <<<<<<<<<<<<<< * return * if hasattr(target,method): */ - __pyx_t_5 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyString_Type)), __pyx_v_desc); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 585, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_CallOneArg(((PyObject *)(&PyString_Type)), __pyx_v_desc); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 597, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __pyx_t_2 = NULL; __pyx_t_4 = 0; @@ -19769,7 +20019,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_8)) { PyObject *__pyx_temp[3] = {__pyx_t_2, __pyx_kp_s_Block_methodAction_desc_s_method, __pyx_t_5}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 584, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 596, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; @@ -19778,14 +20028,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_8)) { PyObject *__pyx_temp[3] = {__pyx_t_2, __pyx_kp_s_Block_methodAction_desc_s_method, __pyx_t_5}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 584, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 596, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; } else #endif { - __pyx_t_3 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 584, __pyx_L1_error) + __pyx_t_3 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 596, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); if (__pyx_t_2) { __Pyx_GIVEREF(__pyx_t_2); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); __pyx_t_2 = NULL; @@ -19796,14 +20046,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU __Pyx_GIVEREF(__pyx_t_5); PyTuple_SET_ITEM(__pyx_t_3, 1+__pyx_t_4, __pyx_t_5); __pyx_t_5 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 584, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 596, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":586 + /* "kivyblocks/blocks.pyx":598 * Logger.info('Block: methodAction():desc(%s) method not found', * str(desc)) * return # <<<<<<<<<<<<<< @@ -19814,7 +20064,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "kivyblocks/blocks.pyx":583 + /* "kivyblocks/blocks.pyx":595 * str(desc)) * return * if method is None: # <<<<<<<<<<<<<< @@ -19823,39 +20073,39 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU */ } - /* "kivyblocks/blocks.pyx":587 + /* "kivyblocks/blocks.pyx":599 * str(desc)) * return * if hasattr(target,method): # <<<<<<<<<<<<<< * f = getattr(target, method) * kwargs = desc.get('options',{}).copy() */ - __pyx_t_6 = __Pyx_HasAttr(__pyx_v_target, __pyx_v_method); if (unlikely(__pyx_t_6 == ((int)-1))) __PYX_ERR(0, 587, __pyx_L1_error) + __pyx_t_6 = __Pyx_HasAttr(__pyx_v_target, __pyx_v_method); if (unlikely(__pyx_t_6 == ((int)-1))) __PYX_ERR(0, 599, __pyx_L1_error) __pyx_t_7 = (__pyx_t_6 != 0); if (__pyx_t_7) { - /* "kivyblocks/blocks.pyx":588 + /* "kivyblocks/blocks.pyx":600 * return * if hasattr(target,method): * f = getattr(target, method) # <<<<<<<<<<<<<< * kwargs = desc.get('options',{}).copy() * d = self.getActionData(widget,desc, *args) */ - __pyx_t_1 = __Pyx_GetAttr(__pyx_v_target, __pyx_v_method); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 588, __pyx_L1_error) + __pyx_t_1 = __Pyx_GetAttr(__pyx_v_target, __pyx_v_method); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 600, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_v_f = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":589 + /* "kivyblocks/blocks.pyx":601 * if hasattr(target,method): * f = getattr(target, method) * kwargs = desc.get('options',{}).copy() # <<<<<<<<<<<<<< * d = self.getActionData(widget,desc, *args) * if d: */ - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 589, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 601, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_5 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 589, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 601, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __pyx_t_2 = NULL; __pyx_t_4 = 0; @@ -19872,7 +20122,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_3)) { PyObject *__pyx_temp[3] = {__pyx_t_2, __pyx_n_s_options, __pyx_t_5}; - __pyx_t_8 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 589, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 601, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; @@ -19881,14 +20131,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_3)) { PyObject *__pyx_temp[3] = {__pyx_t_2, __pyx_n_s_options, __pyx_t_5}; - __pyx_t_8 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 589, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_4, 2+__pyx_t_4); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 601, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; } else #endif { - __pyx_t_9 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 589, __pyx_L1_error) + __pyx_t_9 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 601, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_9); if (__pyx_t_2) { __Pyx_GIVEREF(__pyx_t_2); PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_2); __pyx_t_2 = NULL; @@ -19899,12 +20149,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU __Pyx_GIVEREF(__pyx_t_5); PyTuple_SET_ITEM(__pyx_t_9, 1+__pyx_t_4, __pyx_t_5); __pyx_t_5 = 0; - __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_9, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 589, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_9, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 601, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; } __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_copy); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 589, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_copy); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 601, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __pyx_t_8 = NULL; @@ -19919,22 +20169,22 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU } __pyx_t_1 = (__pyx_t_8) ? __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_8) : __Pyx_PyObject_CallNoArg(__pyx_t_3); __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 589, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 601, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_v_kwargs = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":590 + /* "kivyblocks/blocks.pyx":602 * f = getattr(target, method) * kwargs = desc.get('options',{}).copy() * d = self.getActionData(widget,desc, *args) # <<<<<<<<<<<<<< * if d: * kwargs.update(d) */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_getActionData); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 590, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_getActionData); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 602, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 590, __pyx_L1_error) + __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 602, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_INCREF(__pyx_v_widget); __Pyx_GIVEREF(__pyx_v_widget); @@ -19942,34 +20192,34 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU __Pyx_INCREF(__pyx_v_desc); __Pyx_GIVEREF(__pyx_v_desc); PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_v_desc); - __pyx_t_8 = PyNumber_Add(__pyx_t_3, __pyx_v_args); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 590, __pyx_L1_error) + __pyx_t_8 = PyNumber_Add(__pyx_t_3, __pyx_v_args); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 602, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_8, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 590, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_8, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 602, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __pyx_v_d = __pyx_t_3; __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":591 + /* "kivyblocks/blocks.pyx":603 * kwargs = desc.get('options',{}).copy() * d = self.getActionData(widget,desc, *args) * if d: # <<<<<<<<<<<<<< * kwargs.update(d) * f(*args, **kwargs) */ - __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_v_d); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 591, __pyx_L1_error) + __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_v_d); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 603, __pyx_L1_error) if (__pyx_t_7) { - /* "kivyblocks/blocks.pyx":592 + /* "kivyblocks/blocks.pyx":604 * d = self.getActionData(widget,desc, *args) * if d: * kwargs.update(d) # <<<<<<<<<<<<<< * f(*args, **kwargs) * else: */ - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_kwargs, __pyx_n_s_update); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 592, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_kwargs, __pyx_n_s_update); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 604, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __pyx_t_1 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_8))) { @@ -19983,12 +20233,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU } __pyx_t_3 = (__pyx_t_1) ? __Pyx_PyObject_Call2Args(__pyx_t_8, __pyx_t_1, __pyx_v_d) : __Pyx_PyObject_CallOneArg(__pyx_t_8, __pyx_v_d); __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 592, __pyx_L1_error) + if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 604, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":591 + /* "kivyblocks/blocks.pyx":603 * kwargs = desc.get('options',{}).copy() * d = self.getActionData(widget,desc, *args) * if d: # <<<<<<<<<<<<<< @@ -19997,7 +20247,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU */ } - /* "kivyblocks/blocks.pyx":593 + /* "kivyblocks/blocks.pyx":605 * if d: * kwargs.update(d) * f(*args, **kwargs) # <<<<<<<<<<<<<< @@ -20006,21 +20256,21 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU */ if (unlikely(__pyx_v_kwargs == Py_None)) { PyErr_SetString(PyExc_TypeError, "argument after ** must be a mapping, not NoneType"); - __PYX_ERR(0, 593, __pyx_L1_error) + __PYX_ERR(0, 605, __pyx_L1_error) } if (likely(PyDict_CheckExact(__pyx_v_kwargs))) { - __pyx_t_3 = PyDict_Copy(__pyx_v_kwargs); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 593, __pyx_L1_error) + __pyx_t_3 = PyDict_Copy(__pyx_v_kwargs); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 605, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); } else { - __pyx_t_3 = PyObject_CallFunctionObjArgs((PyObject*)&PyDict_Type, __pyx_v_kwargs, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 593, __pyx_L1_error) + __pyx_t_3 = PyObject_CallFunctionObjArgs((PyObject*)&PyDict_Type, __pyx_v_kwargs, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 605, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); } - __pyx_t_8 = __Pyx_PyObject_Call(__pyx_v_f, __pyx_v_args, __pyx_t_3); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 593, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_Call(__pyx_v_f, __pyx_v_args, __pyx_t_3); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 605, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "kivyblocks/blocks.pyx":587 + /* "kivyblocks/blocks.pyx":599 * str(desc)) * return * if hasattr(target,method): # <<<<<<<<<<<<<< @@ -20030,7 +20280,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU goto __pyx_L5; } - /* "kivyblocks/blocks.pyx":595 + /* "kivyblocks/blocks.pyx":607 * f(*args, **kwargs) * else: * alert('%s method not found' % method) # <<<<<<<<<<<<<< @@ -20038,9 +20288,9 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU * def widgetBuild(self, desc): */ /*else*/ { - __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_alert); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 595, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_alert); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 607, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_1 = __Pyx_PyString_FormatSafe(__pyx_kp_s_s_method_not_found, __pyx_v_method); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 595, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyString_FormatSafe(__pyx_kp_s_s_method_not_found, __pyx_v_method); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 607, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_t_9 = NULL; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_3))) { @@ -20055,14 +20305,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU __pyx_t_8 = (__pyx_t_9) ? __Pyx_PyObject_Call2Args(__pyx_t_3, __pyx_t_9, __pyx_t_1) : __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_1); __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 595, __pyx_L1_error) + if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 607, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; } __pyx_L5:; - /* "kivyblocks/blocks.pyx":576 + /* "kivyblocks/blocks.pyx":588 * return {} * * def methodAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< @@ -20093,7 +20343,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_52methodAction(CYTHON_UNU return __pyx_r; } -/* "kivyblocks/blocks.pyx":597 +/* "kivyblocks/blocks.pyx":609 * alert('%s method not found' % method) * * def widgetBuild(self, desc): # <<<<<<<<<<<<<< @@ -20137,11 +20387,11 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_55widgetBuild(PyObject *_ case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_desc)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("widgetBuild", 1, 2, 2, 1); __PYX_ERR(0, 597, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("widgetBuild", 1, 2, 2, 1); __PYX_ERR(0, 609, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "widgetBuild") < 0)) __PYX_ERR(0, 597, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "widgetBuild") < 0)) __PYX_ERR(0, 609, __pyx_L3_error) } } else if (PyTuple_GET_SIZE(__pyx_args) != 2) { goto __pyx_L5_argtuple_error; @@ -20154,7 +20404,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_55widgetBuild(PyObject *_ } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("widgetBuild", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 597, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("widgetBuild", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 609, __pyx_L3_error) __pyx_L3_error:; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.widgetBuild", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); @@ -20167,7 +20417,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_55widgetBuild(PyObject *_ return __pyx_r; } -/* "kivyblocks/blocks.pyx":610 +/* "kivyblocks/blocks.pyx":622 * } * """ * def doit(desc): # <<<<<<<<<<<<<< @@ -20217,28 +20467,28 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(PyObje __pyx_cur_scope = __pyx_outer_scope; __Pyx_INCREF(__pyx_v_desc); - /* "kivyblocks/blocks.pyx":611 + /* "kivyblocks/blocks.pyx":623 * """ * def doit(desc): * if isinstance(desc,DictObject): # <<<<<<<<<<<<<< * desc = desc.to_dict() * if not isinstance(desc,dict): */ - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_DictObject); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 611, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_DictObject); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 623, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = PyObject_IsInstance(__pyx_v_desc, __pyx_t_1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 611, __pyx_L1_error) + __pyx_t_2 = PyObject_IsInstance(__pyx_v_desc, __pyx_t_1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 623, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_t_3 = (__pyx_t_2 != 0); if (__pyx_t_3) { - /* "kivyblocks/blocks.pyx":612 + /* "kivyblocks/blocks.pyx":624 * def doit(desc): * if isinstance(desc,DictObject): * desc = desc.to_dict() # <<<<<<<<<<<<<< * if not isinstance(desc,dict): * Logger.info('Block: desc(%s) must be a dict object(%s)', */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_to_dict); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 612, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_to_dict); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 624, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __pyx_t_5 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_4))) { @@ -20252,13 +20502,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(PyObje } __pyx_t_1 = (__pyx_t_5) ? __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_5) : __Pyx_PyObject_CallNoArg(__pyx_t_4); __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 612, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 624, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF_SET(__pyx_v_desc, __pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":611 + /* "kivyblocks/blocks.pyx":623 * """ * def doit(desc): * if isinstance(desc,DictObject): # <<<<<<<<<<<<<< @@ -20267,7 +20517,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(PyObje */ } - /* "kivyblocks/blocks.pyx":613 + /* "kivyblocks/blocks.pyx":625 * if isinstance(desc,DictObject): * desc = desc.to_dict() * if not isinstance(desc,dict): # <<<<<<<<<<<<<< @@ -20278,20 +20528,20 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(PyObje __pyx_t_2 = ((!(__pyx_t_3 != 0)) != 0); if (__pyx_t_2) { - /* "kivyblocks/blocks.pyx":614 + /* "kivyblocks/blocks.pyx":626 * desc = desc.to_dict() * if not isinstance(desc,dict): * Logger.info('Block: desc(%s) must be a dict object(%s)', # <<<<<<<<<<<<<< * desc,type(desc)) * return None */ - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_Logger); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 614, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_Logger); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 626, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_info); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 614, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_info); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 626, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":615 + /* "kivyblocks/blocks.pyx":627 * if not isinstance(desc,dict): * Logger.info('Block: desc(%s) must be a dict object(%s)', * desc,type(desc)) # <<<<<<<<<<<<<< @@ -20313,7 +20563,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(PyObje #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_5)) { PyObject *__pyx_temp[4] = {__pyx_t_4, __pyx_kp_s_Block_desc_s_must_be_a_dict_obje, __pyx_v_desc, ((PyObject *)Py_TYPE(__pyx_v_desc))}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_6, 3+__pyx_t_6); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 614, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_6, 3+__pyx_t_6); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 626, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_GOTREF(__pyx_t_1); } else @@ -20321,13 +20571,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(PyObje #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) { PyObject *__pyx_temp[4] = {__pyx_t_4, __pyx_kp_s_Block_desc_s_must_be_a_dict_obje, __pyx_v_desc, ((PyObject *)Py_TYPE(__pyx_v_desc))}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_6, 3+__pyx_t_6); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 614, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_6, 3+__pyx_t_6); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 626, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_GOTREF(__pyx_t_1); } else #endif { - __pyx_t_7 = PyTuple_New(3+__pyx_t_6); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 614, __pyx_L1_error) + __pyx_t_7 = PyTuple_New(3+__pyx_t_6); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 626, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); if (__pyx_t_4) { __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_4); __pyx_t_4 = NULL; @@ -20341,14 +20591,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(PyObje __Pyx_INCREF(((PyObject *)Py_TYPE(__pyx_v_desc))); __Pyx_GIVEREF(((PyObject *)Py_TYPE(__pyx_v_desc))); PyTuple_SET_ITEM(__pyx_t_7, 2+__pyx_t_6, ((PyObject *)Py_TYPE(__pyx_v_desc))); - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_7, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 614, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_7, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 626, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; } __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":616 + /* "kivyblocks/blocks.pyx":628 * Logger.info('Block: desc(%s) must be a dict object(%s)', * desc,type(desc)) * return None # <<<<<<<<<<<<<< @@ -20359,7 +20609,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(PyObje __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "kivyblocks/blocks.pyx":613 + /* "kivyblocks/blocks.pyx":625 * if isinstance(desc,DictObject): * desc = desc.to_dict() * if not isinstance(desc,dict): # <<<<<<<<<<<<<< @@ -20368,7 +20618,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(PyObje */ } - /* "kivyblocks/blocks.pyx":619 + /* "kivyblocks/blocks.pyx":631 * * # desc = self.valueExpr(desc) * try: # <<<<<<<<<<<<<< @@ -20384,15 +20634,15 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(PyObje __Pyx_XGOTREF(__pyx_t_10); /*try:*/ { - /* "kivyblocks/blocks.pyx":620 + /* "kivyblocks/blocks.pyx":632 * # desc = self.valueExpr(desc) * try: * widget = self.w_build(desc) # <<<<<<<<<<<<<< * self.dispatch('on_built',widget) * if hasattr(widget,'ready'): */ - if (unlikely(!__pyx_cur_scope->__pyx_v_self)) { __Pyx_RaiseClosureNameError("self"); __PYX_ERR(0, 620, __pyx_L5_error) } - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_self, __pyx_n_s_w_build); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 620, __pyx_L5_error) + if (unlikely(!__pyx_cur_scope->__pyx_v_self)) { __Pyx_RaiseClosureNameError("self"); __PYX_ERR(0, 632, __pyx_L5_error) } + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_self, __pyx_n_s_w_build); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 632, __pyx_L5_error) __Pyx_GOTREF(__pyx_t_5); __pyx_t_7 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_5))) { @@ -20406,21 +20656,21 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(PyObje } __pyx_t_1 = (__pyx_t_7) ? __Pyx_PyObject_Call2Args(__pyx_t_5, __pyx_t_7, __pyx_v_desc) : __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_v_desc); __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 620, __pyx_L5_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 632, __pyx_L5_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_v_widget = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":621 + /* "kivyblocks/blocks.pyx":633 * try: * widget = self.w_build(desc) * self.dispatch('on_built',widget) # <<<<<<<<<<<<<< * if hasattr(widget,'ready'): * widget.ready = True */ - if (unlikely(!__pyx_cur_scope->__pyx_v_self)) { __Pyx_RaiseClosureNameError("self"); __PYX_ERR(0, 621, __pyx_L5_error) } - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_self, __pyx_n_s_dispatch); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 621, __pyx_L5_error) + if (unlikely(!__pyx_cur_scope->__pyx_v_self)) { __Pyx_RaiseClosureNameError("self"); __PYX_ERR(0, 633, __pyx_L5_error) } + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_self, __pyx_n_s_dispatch); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 633, __pyx_L5_error) __Pyx_GOTREF(__pyx_t_5); __pyx_t_7 = NULL; __pyx_t_6 = 0; @@ -20437,7 +20687,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(PyObje #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_5)) { PyObject *__pyx_temp[3] = {__pyx_t_7, __pyx_n_s_on_built, __pyx_v_widget}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 621, __pyx_L5_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 633, __pyx_L5_error) __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_GOTREF(__pyx_t_1); } else @@ -20445,13 +20695,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(PyObje #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) { PyObject *__pyx_temp[3] = {__pyx_t_7, __pyx_n_s_on_built, __pyx_v_widget}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 621, __pyx_L5_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 633, __pyx_L5_error) __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_GOTREF(__pyx_t_1); } else #endif { - __pyx_t_4 = PyTuple_New(2+__pyx_t_6); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 621, __pyx_L5_error) + __pyx_t_4 = PyTuple_New(2+__pyx_t_6); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 633, __pyx_L5_error) __Pyx_GOTREF(__pyx_t_4); if (__pyx_t_7) { __Pyx_GIVEREF(__pyx_t_7); PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_7); __pyx_t_7 = NULL; @@ -20462,34 +20712,34 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(PyObje __Pyx_INCREF(__pyx_v_widget); __Pyx_GIVEREF(__pyx_v_widget); PyTuple_SET_ITEM(__pyx_t_4, 1+__pyx_t_6, __pyx_v_widget); - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_4, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 621, __pyx_L5_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_4, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 633, __pyx_L5_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; } __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":622 + /* "kivyblocks/blocks.pyx":634 * widget = self.w_build(desc) * self.dispatch('on_built',widget) * if hasattr(widget,'ready'): # <<<<<<<<<<<<<< * widget.ready = True * return widget */ - __pyx_t_2 = __Pyx_HasAttr(__pyx_v_widget, __pyx_n_s_ready); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 622, __pyx_L5_error) + __pyx_t_2 = __Pyx_HasAttr(__pyx_v_widget, __pyx_n_s_ready); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 634, __pyx_L5_error) __pyx_t_3 = (__pyx_t_2 != 0); if (__pyx_t_3) { - /* "kivyblocks/blocks.pyx":623 + /* "kivyblocks/blocks.pyx":635 * self.dispatch('on_built',widget) * if hasattr(widget,'ready'): * widget.ready = True # <<<<<<<<<<<<<< * return widget * except Exception as e: */ - if (__Pyx_PyObject_SetAttrStr(__pyx_v_widget, __pyx_n_s_ready, Py_True) < 0) __PYX_ERR(0, 623, __pyx_L5_error) + if (__Pyx_PyObject_SetAttrStr(__pyx_v_widget, __pyx_n_s_ready, Py_True) < 0) __PYX_ERR(0, 635, __pyx_L5_error) - /* "kivyblocks/blocks.pyx":622 + /* "kivyblocks/blocks.pyx":634 * widget = self.w_build(desc) * self.dispatch('on_built',widget) * if hasattr(widget,'ready'): # <<<<<<<<<<<<<< @@ -20498,7 +20748,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(PyObje */ } - /* "kivyblocks/blocks.pyx":624 + /* "kivyblocks/blocks.pyx":636 * if hasattr(widget,'ready'): * widget.ready = True * return widget # <<<<<<<<<<<<<< @@ -20510,7 +20760,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(PyObje __pyx_r = __pyx_v_widget; goto __pyx_L9_try_return; - /* "kivyblocks/blocks.pyx":619 + /* "kivyblocks/blocks.pyx":631 * * # desc = self.valueExpr(desc) * try: # <<<<<<<<<<<<<< @@ -20524,7 +20774,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(PyObje __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "kivyblocks/blocks.pyx":625 + /* "kivyblocks/blocks.pyx":637 * widget.ready = True * return widget * except Exception as e: # <<<<<<<<<<<<<< @@ -20534,21 +20784,21 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(PyObje __pyx_t_6 = __Pyx_PyErr_ExceptionMatches(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); if (__pyx_t_6) { __Pyx_AddTraceback("kivyblocks.blocks.Blocks.widgetBuild.doit", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_1, &__pyx_t_5, &__pyx_t_4) < 0) __PYX_ERR(0, 625, __pyx_L7_except_error) + if (__Pyx_GetException(&__pyx_t_1, &__pyx_t_5, &__pyx_t_4) < 0) __PYX_ERR(0, 637, __pyx_L7_except_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_GOTREF(__pyx_t_5); __Pyx_GOTREF(__pyx_t_4); __Pyx_INCREF(__pyx_t_5); __pyx_v_e = __pyx_t_5; - /* "kivyblocks/blocks.pyx":626 + /* "kivyblocks/blocks.pyx":638 * return widget * except Exception as e: * print_exc() # <<<<<<<<<<<<<< * self.dispatch('on_failed',e) * return None */ - __Pyx_GetModuleGlobalName(__pyx_t_11, __pyx_n_s_print_exc); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 626, __pyx_L7_except_error) + __Pyx_GetModuleGlobalName(__pyx_t_11, __pyx_n_s_print_exc); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 638, __pyx_L7_except_error) __Pyx_GOTREF(__pyx_t_11); __pyx_t_12 = NULL; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_11))) { @@ -20562,20 +20812,20 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(PyObje } __pyx_t_7 = (__pyx_t_12) ? __Pyx_PyObject_CallOneArg(__pyx_t_11, __pyx_t_12) : __Pyx_PyObject_CallNoArg(__pyx_t_11); __Pyx_XDECREF(__pyx_t_12); __pyx_t_12 = 0; - if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 626, __pyx_L7_except_error) + if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 638, __pyx_L7_except_error) __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "kivyblocks/blocks.pyx":627 + /* "kivyblocks/blocks.pyx":639 * except Exception as e: * print_exc() * self.dispatch('on_failed',e) # <<<<<<<<<<<<<< * return None * */ - if (unlikely(!__pyx_cur_scope->__pyx_v_self)) { __Pyx_RaiseClosureNameError("self"); __PYX_ERR(0, 627, __pyx_L7_except_error) } - __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_self, __pyx_n_s_dispatch); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 627, __pyx_L7_except_error) + if (unlikely(!__pyx_cur_scope->__pyx_v_self)) { __Pyx_RaiseClosureNameError("self"); __PYX_ERR(0, 639, __pyx_L7_except_error) } + __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_self, __pyx_n_s_dispatch); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 639, __pyx_L7_except_error) __Pyx_GOTREF(__pyx_t_11); __pyx_t_12 = NULL; __pyx_t_6 = 0; @@ -20592,7 +20842,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(PyObje #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_11)) { PyObject *__pyx_temp[3] = {__pyx_t_12, __pyx_n_s_on_failed, __pyx_v_e}; - __pyx_t_7 = __Pyx_PyFunction_FastCall(__pyx_t_11, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 627, __pyx_L7_except_error) + __pyx_t_7 = __Pyx_PyFunction_FastCall(__pyx_t_11, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 639, __pyx_L7_except_error) __Pyx_XDECREF(__pyx_t_12); __pyx_t_12 = 0; __Pyx_GOTREF(__pyx_t_7); } else @@ -20600,13 +20850,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(PyObje #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_11)) { PyObject *__pyx_temp[3] = {__pyx_t_12, __pyx_n_s_on_failed, __pyx_v_e}; - __pyx_t_7 = __Pyx_PyCFunction_FastCall(__pyx_t_11, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 627, __pyx_L7_except_error) + __pyx_t_7 = __Pyx_PyCFunction_FastCall(__pyx_t_11, __pyx_temp+1-__pyx_t_6, 2+__pyx_t_6); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 639, __pyx_L7_except_error) __Pyx_XDECREF(__pyx_t_12); __pyx_t_12 = 0; __Pyx_GOTREF(__pyx_t_7); } else #endif { - __pyx_t_13 = PyTuple_New(2+__pyx_t_6); if (unlikely(!__pyx_t_13)) __PYX_ERR(0, 627, __pyx_L7_except_error) + __pyx_t_13 = PyTuple_New(2+__pyx_t_6); if (unlikely(!__pyx_t_13)) __PYX_ERR(0, 639, __pyx_L7_except_error) __Pyx_GOTREF(__pyx_t_13); if (__pyx_t_12) { __Pyx_GIVEREF(__pyx_t_12); PyTuple_SET_ITEM(__pyx_t_13, 0, __pyx_t_12); __pyx_t_12 = NULL; @@ -20617,14 +20867,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(PyObje __Pyx_INCREF(__pyx_v_e); __Pyx_GIVEREF(__pyx_v_e); PyTuple_SET_ITEM(__pyx_t_13, 1+__pyx_t_6, __pyx_v_e); - __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_11, __pyx_t_13, NULL); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 627, __pyx_L7_except_error) + __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_11, __pyx_t_13, NULL); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 639, __pyx_L7_except_error) __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; } __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "kivyblocks/blocks.pyx":628 + /* "kivyblocks/blocks.pyx":640 * print_exc() * self.dispatch('on_failed',e) * return None # <<<<<<<<<<<<<< @@ -20641,7 +20891,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(PyObje goto __pyx_L7_except_error; __pyx_L7_except_error:; - /* "kivyblocks/blocks.pyx":619 + /* "kivyblocks/blocks.pyx":631 * * # desc = self.valueExpr(desc) * try: # <<<<<<<<<<<<<< @@ -20667,7 +20917,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(PyObje goto __pyx_L0; } - /* "kivyblocks/blocks.pyx":610 + /* "kivyblocks/blocks.pyx":622 * } * """ * def doit(desc): # <<<<<<<<<<<<<< @@ -20695,7 +20945,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(PyObje return __pyx_r; } -/* "kivyblocks/blocks.pyx":597 +/* "kivyblocks/blocks.pyx":609 * alert('%s method not found' % method) * * def widgetBuild(self, desc): # <<<<<<<<<<<<<< @@ -20734,7 +20984,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS if (unlikely(!__pyx_cur_scope)) { __pyx_cur_scope = ((struct __pyx_obj_10kivyblocks_6blocks___pyx_scope_struct_2_widgetBuild *)Py_None); __Pyx_INCREF(Py_None); - __PYX_ERR(0, 597, __pyx_L1_error) + __PYX_ERR(0, 609, __pyx_L1_error) } else { __Pyx_GOTREF(__pyx_cur_scope); } @@ -20743,40 +20993,40 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_self); __Pyx_INCREF(__pyx_v_desc); - /* "kivyblocks/blocks.pyx":610 + /* "kivyblocks/blocks.pyx":622 * } * """ * def doit(desc): # <<<<<<<<<<<<<< * if isinstance(desc,DictObject): * desc = desc.to_dict() */ - __pyx_t_1 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_11widgetBuild_1doit, 0, __pyx_n_s_Blocks_widgetBuild_locals_doit, ((PyObject*)__pyx_cur_scope), __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__22)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 610, __pyx_L1_error) + __pyx_t_1 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_11widgetBuild_1doit, 0, __pyx_n_s_Blocks_widgetBuild_locals_doit, ((PyObject*)__pyx_cur_scope), __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__22)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 622, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_v_doit = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":630 + /* "kivyblocks/blocks.pyx":642 * return None * * if isinstance(desc,DictObject): # <<<<<<<<<<<<<< * desc = desc.to_dict() * if not isinstance(desc, dict): */ - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_DictObject); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 630, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_DictObject); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 642, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = PyObject_IsInstance(__pyx_v_desc, __pyx_t_1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 630, __pyx_L1_error) + __pyx_t_2 = PyObject_IsInstance(__pyx_v_desc, __pyx_t_1); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 642, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_t_3 = (__pyx_t_2 != 0); if (__pyx_t_3) { - /* "kivyblocks/blocks.pyx":631 + /* "kivyblocks/blocks.pyx":643 * * if isinstance(desc,DictObject): * desc = desc.to_dict() # <<<<<<<<<<<<<< * if not isinstance(desc, dict): * print('widgetBuild1: desc must be a dict object', */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_to_dict); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 631, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_to_dict); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 643, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __pyx_t_5 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_4))) { @@ -20790,13 +21040,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS } __pyx_t_1 = (__pyx_t_5) ? __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_5) : __Pyx_PyObject_CallNoArg(__pyx_t_4); __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 631, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 643, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF_SET(__pyx_v_desc, __pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":630 + /* "kivyblocks/blocks.pyx":642 * return None * * if isinstance(desc,DictObject): # <<<<<<<<<<<<<< @@ -20805,7 +21055,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS */ } - /* "kivyblocks/blocks.pyx":632 + /* "kivyblocks/blocks.pyx":644 * if isinstance(desc,DictObject): * desc = desc.to_dict() * if not isinstance(desc, dict): # <<<<<<<<<<<<<< @@ -20816,14 +21066,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS __pyx_t_2 = ((!(__pyx_t_3 != 0)) != 0); if (__pyx_t_2) { - /* "kivyblocks/blocks.pyx":633 + /* "kivyblocks/blocks.pyx":645 * desc = desc.to_dict() * if not isinstance(desc, dict): * print('widgetBuild1: desc must be a dict object', # <<<<<<<<<<<<<< * desc,type(desc)) * self.dispatch('on_failed',Exception('miss url')) */ - __pyx_t_1 = PyTuple_New(3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 633, __pyx_L1_error) + __pyx_t_1 = PyTuple_New(3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 645, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_kp_s_widgetBuild1_desc_must_be_a_dict); __Pyx_GIVEREF(__pyx_kp_s_widgetBuild1_desc_must_be_a_dict); @@ -20834,19 +21084,19 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS __Pyx_INCREF(((PyObject *)Py_TYPE(__pyx_v_desc))); __Pyx_GIVEREF(((PyObject *)Py_TYPE(__pyx_v_desc))); PyTuple_SET_ITEM(__pyx_t_1, 2, ((PyObject *)Py_TYPE(__pyx_v_desc))); - if (__Pyx_PrintOne(0, __pyx_t_1) < 0) __PYX_ERR(0, 633, __pyx_L1_error) + if (__Pyx_PrintOne(0, __pyx_t_1) < 0) __PYX_ERR(0, 645, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":635 + /* "kivyblocks/blocks.pyx":647 * print('widgetBuild1: desc must be a dict object', * desc,type(desc)) * self.dispatch('on_failed',Exception('miss url')) # <<<<<<<<<<<<<< * return * */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_self, __pyx_n_s_dispatch); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 635, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_self, __pyx_n_s_dispatch); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 647, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_5 = __Pyx_PyObject_Call(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])), __pyx_tuple__23, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 635, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_Call(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])), __pyx_tuple__23, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 647, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __pyx_t_6 = NULL; __pyx_t_7 = 0; @@ -20863,7 +21113,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_4)) { PyObject *__pyx_temp[3] = {__pyx_t_6, __pyx_n_s_on_failed, __pyx_t_5}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 635, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 647, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; @@ -20872,14 +21122,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) { PyObject *__pyx_temp[3] = {__pyx_t_6, __pyx_n_s_on_failed, __pyx_t_5}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 635, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 647, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; } else #endif { - __pyx_t_8 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 635, __pyx_L1_error) + __pyx_t_8 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 647, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); if (__pyx_t_6) { __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_6); __pyx_t_6 = NULL; @@ -20890,14 +21140,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS __Pyx_GIVEREF(__pyx_t_5); PyTuple_SET_ITEM(__pyx_t_8, 1+__pyx_t_7, __pyx_t_5); __pyx_t_5 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_8, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 635, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_8, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 647, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; } __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":636 + /* "kivyblocks/blocks.pyx":648 * desc,type(desc)) * self.dispatch('on_failed',Exception('miss url')) * return # <<<<<<<<<<<<<< @@ -20908,7 +21158,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "kivyblocks/blocks.pyx":632 + /* "kivyblocks/blocks.pyx":644 * if isinstance(desc,DictObject): * desc = desc.to_dict() * if not isinstance(desc, dict): # <<<<<<<<<<<<<< @@ -20917,14 +21167,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS */ } - /* "kivyblocks/blocks.pyx":638 + /* "kivyblocks/blocks.pyx":650 * return * * widgettype = desc.get('widgettype') # <<<<<<<<<<<<<< * while widgettype == "urlwidget": * opts = desc.get('options',{}).copy() */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 638, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 650, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __pyx_t_8 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_4))) { @@ -20938,13 +21188,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS } __pyx_t_1 = (__pyx_t_8) ? __Pyx_PyObject_Call2Args(__pyx_t_4, __pyx_t_8, __pyx_n_s_widgettype) : __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_n_s_widgettype); __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 638, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 650, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __pyx_v_widgettype = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":639 + /* "kivyblocks/blocks.pyx":651 * * widgettype = desc.get('widgettype') * while widgettype == "urlwidget": # <<<<<<<<<<<<<< @@ -20952,19 +21202,19 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS * extend = desc.get('extend') */ while (1) { - __pyx_t_2 = (__Pyx_PyString_Equals(__pyx_v_widgettype, __pyx_n_s_urlwidget, Py_EQ)); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 639, __pyx_L1_error) + __pyx_t_2 = (__Pyx_PyString_Equals(__pyx_v_widgettype, __pyx_n_s_urlwidget, Py_EQ)); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 651, __pyx_L1_error) if (!__pyx_t_2) break; - /* "kivyblocks/blocks.pyx":640 + /* "kivyblocks/blocks.pyx":652 * widgettype = desc.get('widgettype') * while widgettype == "urlwidget": * opts = desc.get('options',{}).copy() # <<<<<<<<<<<<<< * extend = desc.get('extend') * addon = None */ - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 640, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 652, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); - __pyx_t_5 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 640, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 652, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __pyx_t_6 = NULL; __pyx_t_7 = 0; @@ -20981,7 +21231,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_8)) { PyObject *__pyx_temp[3] = {__pyx_t_6, __pyx_n_s_options, __pyx_t_5}; - __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 640, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 652, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; @@ -20990,14 +21240,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_8)) { PyObject *__pyx_temp[3] = {__pyx_t_6, __pyx_n_s_options, __pyx_t_5}; - __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 640, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 652, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; } else #endif { - __pyx_t_9 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 640, __pyx_L1_error) + __pyx_t_9 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 652, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_9); if (__pyx_t_6) { __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_6); __pyx_t_6 = NULL; @@ -21008,12 +21258,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS __Pyx_GIVEREF(__pyx_t_5); PyTuple_SET_ITEM(__pyx_t_9, 1+__pyx_t_7, __pyx_t_5); __pyx_t_5 = 0; - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_9, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 640, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_9, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 652, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; } __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_copy); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 640, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_copy); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 652, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __pyx_t_4 = NULL; @@ -21028,20 +21278,20 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS } __pyx_t_1 = (__pyx_t_4) ? __Pyx_PyObject_CallOneArg(__pyx_t_8, __pyx_t_4) : __Pyx_PyObject_CallNoArg(__pyx_t_8); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 640, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 652, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_XDECREF_SET(__pyx_v_opts, __pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":641 + /* "kivyblocks/blocks.pyx":653 * while widgettype == "urlwidget": * opts = desc.get('options',{}).copy() * extend = desc.get('extend') # <<<<<<<<<<<<<< * addon = None * if desc.get('extend'): */ - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 641, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 653, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __pyx_t_4 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_8))) { @@ -21055,13 +21305,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS } __pyx_t_1 = (__pyx_t_4) ? __Pyx_PyObject_Call2Args(__pyx_t_8, __pyx_t_4, __pyx_n_s_extend) : __Pyx_PyObject_CallOneArg(__pyx_t_8, __pyx_n_s_extend); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 641, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 653, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_XDECREF_SET(__pyx_v_extend, __pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":642 + /* "kivyblocks/blocks.pyx":654 * opts = desc.get('options',{}).copy() * extend = desc.get('extend') * addon = None # <<<<<<<<<<<<<< @@ -21071,14 +21321,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS __Pyx_INCREF(Py_None); __Pyx_XDECREF_SET(__pyx_v_addon, Py_None); - /* "kivyblocks/blocks.pyx":643 + /* "kivyblocks/blocks.pyx":655 * extend = desc.get('extend') * addon = None * if desc.get('extend'): # <<<<<<<<<<<<<< * addon = desc.get('extend').copy() * url = opts.get('url') */ - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 643, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 655, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __pyx_t_4 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_8))) { @@ -21092,21 +21342,21 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS } __pyx_t_1 = (__pyx_t_4) ? __Pyx_PyObject_Call2Args(__pyx_t_8, __pyx_t_4, __pyx_n_s_extend) : __Pyx_PyObject_CallOneArg(__pyx_t_8, __pyx_n_s_extend); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 643, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 655, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 643, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 655, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; if (__pyx_t_2) { - /* "kivyblocks/blocks.pyx":644 + /* "kivyblocks/blocks.pyx":656 * addon = None * if desc.get('extend'): * addon = desc.get('extend').copy() # <<<<<<<<<<<<<< * url = opts.get('url') * if url is None: */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 644, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 656, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __pyx_t_9 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_4))) { @@ -21120,10 +21370,10 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS } __pyx_t_8 = (__pyx_t_9) ? __Pyx_PyObject_Call2Args(__pyx_t_4, __pyx_t_9, __pyx_n_s_extend) : __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_n_s_extend); __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; - if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 644, __pyx_L1_error) + if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 656, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_copy); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 644, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_copy); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 656, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __pyx_t_8 = NULL; @@ -21138,13 +21388,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS } __pyx_t_1 = (__pyx_t_8) ? __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_8) : __Pyx_PyObject_CallNoArg(__pyx_t_4); __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 644, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 656, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF_SET(__pyx_v_addon, __pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":643 + /* "kivyblocks/blocks.pyx":655 * extend = desc.get('extend') * addon = None * if desc.get('extend'): # <<<<<<<<<<<<<< @@ -21153,14 +21403,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS */ } - /* "kivyblocks/blocks.pyx":645 + /* "kivyblocks/blocks.pyx":657 * if desc.get('extend'): * addon = desc.get('extend').copy() * url = opts.get('url') # <<<<<<<<<<<<<< * if url is None: * self.dispatch('on_failed',Exception('miss url')) */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_opts, __pyx_n_s_get); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 645, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_opts, __pyx_n_s_get); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 657, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __pyx_t_8 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_4))) { @@ -21174,13 +21424,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS } __pyx_t_1 = (__pyx_t_8) ? __Pyx_PyObject_Call2Args(__pyx_t_4, __pyx_t_8, __pyx_n_s_url) : __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_n_s_url); __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 645, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 657, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_XDECREF_SET(__pyx_v_url, __pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":646 + /* "kivyblocks/blocks.pyx":658 * addon = desc.get('extend').copy() * url = opts.get('url') * if url is None: # <<<<<<<<<<<<<< @@ -21191,16 +21441,16 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS __pyx_t_3 = (__pyx_t_2 != 0); if (__pyx_t_3) { - /* "kivyblocks/blocks.pyx":647 + /* "kivyblocks/blocks.pyx":659 * url = opts.get('url') * if url is None: * self.dispatch('on_failed',Exception('miss url')) # <<<<<<<<<<<<<< * return * */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_self, __pyx_n_s_dispatch); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 647, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_self, __pyx_n_s_dispatch); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 659, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_8 = __Pyx_PyObject_Call(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])), __pyx_tuple__23, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 647, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_Call(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])), __pyx_tuple__23, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 659, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __pyx_t_9 = NULL; __pyx_t_7 = 0; @@ -21217,7 +21467,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_4)) { PyObject *__pyx_temp[3] = {__pyx_t_9, __pyx_n_s_on_failed, __pyx_t_8}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 647, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 659, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; @@ -21226,14 +21476,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) { PyObject *__pyx_temp[3] = {__pyx_t_9, __pyx_n_s_on_failed, __pyx_t_8}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 647, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 659, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; } else #endif { - __pyx_t_5 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 647, __pyx_L1_error) + __pyx_t_5 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 659, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); if (__pyx_t_9) { __Pyx_GIVEREF(__pyx_t_9); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_9); __pyx_t_9 = NULL; @@ -21244,14 +21494,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS __Pyx_GIVEREF(__pyx_t_8); PyTuple_SET_ITEM(__pyx_t_5, 1+__pyx_t_7, __pyx_t_8); __pyx_t_8 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_5, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 647, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_5, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 659, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; } __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":648 + /* "kivyblocks/blocks.pyx":660 * if url is None: * self.dispatch('on_failed',Exception('miss url')) * return # <<<<<<<<<<<<<< @@ -21262,7 +21512,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "kivyblocks/blocks.pyx":646 + /* "kivyblocks/blocks.pyx":658 * addon = desc.get('extend').copy() * url = opts.get('url') * if url is None: # <<<<<<<<<<<<<< @@ -21271,14 +21521,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS */ } - /* "kivyblocks/blocks.pyx":650 + /* "kivyblocks/blocks.pyx":662 * return * * if opts.get('url'): # <<<<<<<<<<<<<< * del opts['url'] * rtdesc = self.build_rtdesc(opts) */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_opts, __pyx_n_s_get); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 650, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_opts, __pyx_n_s_get); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 662, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __pyx_t_5 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_4))) { @@ -21292,23 +21542,23 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS } __pyx_t_1 = (__pyx_t_5) ? __Pyx_PyObject_Call2Args(__pyx_t_4, __pyx_t_5, __pyx_n_s_url) : __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_n_s_url); __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 650, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 662, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 650, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 662, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; if (__pyx_t_3) { - /* "kivyblocks/blocks.pyx":651 + /* "kivyblocks/blocks.pyx":663 * * if opts.get('url'): * del opts['url'] # <<<<<<<<<<<<<< * rtdesc = self.build_rtdesc(opts) * if rtdesc: */ - if (unlikely(PyObject_DelItem(__pyx_v_opts, __pyx_n_s_url) < 0)) __PYX_ERR(0, 651, __pyx_L1_error) + if (unlikely(PyObject_DelItem(__pyx_v_opts, __pyx_n_s_url) < 0)) __PYX_ERR(0, 663, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":650 + /* "kivyblocks/blocks.pyx":662 * return * * if opts.get('url'): # <<<<<<<<<<<<<< @@ -21317,14 +21567,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS */ } - /* "kivyblocks/blocks.pyx":652 + /* "kivyblocks/blocks.pyx":664 * if opts.get('url'): * del opts['url'] * rtdesc = self.build_rtdesc(opts) # <<<<<<<<<<<<<< * if rtdesc: * rtdata = self.get_rtdata(None, rtdesc) */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_self, __pyx_n_s_build_rtdesc); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 652, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_self, __pyx_n_s_build_rtdesc); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 664, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __pyx_t_5 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_4))) { @@ -21338,30 +21588,30 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS } __pyx_t_1 = (__pyx_t_5) ? __Pyx_PyObject_Call2Args(__pyx_t_4, __pyx_t_5, __pyx_v_opts) : __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_v_opts); __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 652, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 664, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_XDECREF_SET(__pyx_v_rtdesc, __pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":653 + /* "kivyblocks/blocks.pyx":665 * del opts['url'] * rtdesc = self.build_rtdesc(opts) * if rtdesc: # <<<<<<<<<<<<<< * rtdata = self.get_rtdata(None, rtdesc) * params = opts.get('params', {}) */ - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_rtdesc); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 653, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_rtdesc); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 665, __pyx_L1_error) if (__pyx_t_3) { - /* "kivyblocks/blocks.pyx":654 + /* "kivyblocks/blocks.pyx":666 * rtdesc = self.build_rtdesc(opts) * if rtdesc: * rtdata = self.get_rtdata(None, rtdesc) # <<<<<<<<<<<<<< * params = opts.get('params', {}) * params.update(rtdata) */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_self, __pyx_n_s_get_rtdata); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 654, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_self, __pyx_n_s_get_rtdata); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 666, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __pyx_t_5 = NULL; __pyx_t_7 = 0; @@ -21378,7 +21628,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_4)) { PyObject *__pyx_temp[3] = {__pyx_t_5, Py_None, __pyx_v_rtdesc}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 654, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 666, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_GOTREF(__pyx_t_1); } else @@ -21386,13 +21636,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) { PyObject *__pyx_temp[3] = {__pyx_t_5, Py_None, __pyx_v_rtdesc}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 654, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 666, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_GOTREF(__pyx_t_1); } else #endif { - __pyx_t_8 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 654, __pyx_L1_error) + __pyx_t_8 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 666, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); if (__pyx_t_5) { __Pyx_GIVEREF(__pyx_t_5); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_5); __pyx_t_5 = NULL; @@ -21403,7 +21653,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS __Pyx_INCREF(__pyx_v_rtdesc); __Pyx_GIVEREF(__pyx_v_rtdesc); PyTuple_SET_ITEM(__pyx_t_8, 1+__pyx_t_7, __pyx_v_rtdesc); - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_8, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 654, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_8, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 666, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; } @@ -21411,16 +21661,16 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS __Pyx_XDECREF_SET(__pyx_v_rtdata, __pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":655 + /* "kivyblocks/blocks.pyx":667 * if rtdesc: * rtdata = self.get_rtdata(None, rtdesc) * params = opts.get('params', {}) # <<<<<<<<<<<<<< * params.update(rtdata) * opts['params'] = params */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_opts, __pyx_n_s_get); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 655, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_opts, __pyx_n_s_get); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 667, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_8 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 655, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 667, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __pyx_t_5 = NULL; __pyx_t_7 = 0; @@ -21437,7 +21687,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_4)) { PyObject *__pyx_temp[3] = {__pyx_t_5, __pyx_n_s_params, __pyx_t_8}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 655, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 667, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; @@ -21446,14 +21696,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) { PyObject *__pyx_temp[3] = {__pyx_t_5, __pyx_n_s_params, __pyx_t_8}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 655, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 667, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; } else #endif { - __pyx_t_9 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 655, __pyx_L1_error) + __pyx_t_9 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 667, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_9); if (__pyx_t_5) { __Pyx_GIVEREF(__pyx_t_5); PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_5); __pyx_t_5 = NULL; @@ -21464,7 +21714,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS __Pyx_GIVEREF(__pyx_t_8); PyTuple_SET_ITEM(__pyx_t_9, 1+__pyx_t_7, __pyx_t_8); __pyx_t_8 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_9, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 655, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_9, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 667, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; } @@ -21472,14 +21722,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS __Pyx_XDECREF_SET(__pyx_v_params, __pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":656 + /* "kivyblocks/blocks.pyx":668 * rtdata = self.get_rtdata(None, rtdesc) * params = opts.get('params', {}) * params.update(rtdata) # <<<<<<<<<<<<<< * opts['params'] = params * */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_params, __pyx_n_s_update); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 656, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_params, __pyx_n_s_update); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 668, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __pyx_t_9 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_4))) { @@ -21493,21 +21743,21 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS } __pyx_t_1 = (__pyx_t_9) ? __Pyx_PyObject_Call2Args(__pyx_t_4, __pyx_t_9, __pyx_v_rtdata) : __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_v_rtdata); __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 656, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 668, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":657 + /* "kivyblocks/blocks.pyx":669 * params = opts.get('params', {}) * params.update(rtdata) * opts['params'] = params # <<<<<<<<<<<<<< * * desc = self.getUrlData(url,**opts) */ - if (unlikely(PyObject_SetItem(__pyx_v_opts, __pyx_n_s_params, __pyx_v_params) < 0)) __PYX_ERR(0, 657, __pyx_L1_error) + if (unlikely(PyObject_SetItem(__pyx_v_opts, __pyx_n_s_params, __pyx_v_params) < 0)) __PYX_ERR(0, 669, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":653 + /* "kivyblocks/blocks.pyx":665 * del opts['url'] * rtdesc = self.build_rtdesc(opts) * if rtdesc: # <<<<<<<<<<<<<< @@ -21516,32 +21766,32 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS */ } - /* "kivyblocks/blocks.pyx":659 + /* "kivyblocks/blocks.pyx":671 * opts['params'] = params * * desc = self.getUrlData(url,**opts) # <<<<<<<<<<<<<< * if not (isinstance(desc, DictObject) or \ * isinstance(desc, dict)): */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_self, __pyx_n_s_getUrlData); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 659, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_self, __pyx_n_s_getUrlData); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 671, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 659, __pyx_L1_error) + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 671, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_INCREF(__pyx_v_url); __Pyx_GIVEREF(__pyx_v_url); PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_v_url); if (unlikely(__pyx_v_opts == Py_None)) { PyErr_SetString(PyExc_TypeError, "argument after ** must be a mapping, not NoneType"); - __PYX_ERR(0, 659, __pyx_L1_error) + __PYX_ERR(0, 671, __pyx_L1_error) } if (likely(PyDict_CheckExact(__pyx_v_opts))) { - __pyx_t_9 = PyDict_Copy(__pyx_v_opts); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 659, __pyx_L1_error) + __pyx_t_9 = PyDict_Copy(__pyx_v_opts); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 671, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_9); } else { - __pyx_t_9 = PyObject_CallFunctionObjArgs((PyObject*)&PyDict_Type, __pyx_v_opts, NULL); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 659, __pyx_L1_error) + __pyx_t_9 = PyObject_CallFunctionObjArgs((PyObject*)&PyDict_Type, __pyx_v_opts, NULL); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 671, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_9); } - __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_4, __pyx_t_9); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 659, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_4, __pyx_t_9); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 671, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; @@ -21549,16 +21799,16 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS __Pyx_DECREF_SET(__pyx_v_desc, __pyx_t_8); __pyx_t_8 = 0; - /* "kivyblocks/blocks.pyx":660 + /* "kivyblocks/blocks.pyx":672 * * desc = self.getUrlData(url,**opts) * if not (isinstance(desc, DictObject) or \ # <<<<<<<<<<<<<< * isinstance(desc, dict)): * print('Block2: desc must be a dict object', */ - __Pyx_GetModuleGlobalName(__pyx_t_8, __pyx_n_s_DictObject); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 660, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_8, __pyx_n_s_DictObject); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 672, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); - __pyx_t_2 = PyObject_IsInstance(__pyx_v_desc, __pyx_t_8); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 660, __pyx_L1_error) + __pyx_t_2 = PyObject_IsInstance(__pyx_v_desc, __pyx_t_8); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 672, __pyx_L1_error) __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __pyx_t_10 = (__pyx_t_2 != 0); if (!__pyx_t_10) { @@ -21567,7 +21817,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS goto __pyx_L12_bool_binop_done; } - /* "kivyblocks/blocks.pyx":661 + /* "kivyblocks/blocks.pyx":673 * desc = self.getUrlData(url,**opts) * if not (isinstance(desc, DictObject) or \ * isinstance(desc, dict)): # <<<<<<<<<<<<<< @@ -21579,7 +21829,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS __pyx_t_3 = __pyx_t_2; __pyx_L12_bool_binop_done:; - /* "kivyblocks/blocks.pyx":660 + /* "kivyblocks/blocks.pyx":672 * * desc = self.getUrlData(url,**opts) * if not (isinstance(desc, DictObject) or \ # <<<<<<<<<<<<<< @@ -21589,14 +21839,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS __pyx_t_2 = ((!__pyx_t_3) != 0); if (__pyx_t_2) { - /* "kivyblocks/blocks.pyx":662 + /* "kivyblocks/blocks.pyx":674 * if not (isinstance(desc, DictObject) or \ * isinstance(desc, dict)): * print('Block2: desc must be a dict object', # <<<<<<<<<<<<<< * desc,type(desc)) * self.dispatch('on_failed',Exception('miss url')) */ - __pyx_t_8 = PyTuple_New(3); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 662, __pyx_L1_error) + __pyx_t_8 = PyTuple_New(3); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 674, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_INCREF(__pyx_kp_s_Block2_desc_must_be_a_dict_objec); __Pyx_GIVEREF(__pyx_kp_s_Block2_desc_must_be_a_dict_objec); @@ -21607,19 +21857,19 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS __Pyx_INCREF(((PyObject *)Py_TYPE(__pyx_v_desc))); __Pyx_GIVEREF(((PyObject *)Py_TYPE(__pyx_v_desc))); PyTuple_SET_ITEM(__pyx_t_8, 2, ((PyObject *)Py_TYPE(__pyx_v_desc))); - if (__Pyx_PrintOne(0, __pyx_t_8) < 0) __PYX_ERR(0, 662, __pyx_L1_error) + if (__Pyx_PrintOne(0, __pyx_t_8) < 0) __PYX_ERR(0, 674, __pyx_L1_error) __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "kivyblocks/blocks.pyx":664 + /* "kivyblocks/blocks.pyx":676 * print('Block2: desc must be a dict object', * desc,type(desc)) * self.dispatch('on_failed',Exception('miss url')) # <<<<<<<<<<<<<< * return * */ - __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_self, __pyx_n_s_dispatch); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 664, __pyx_L1_error) + __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_self, __pyx_n_s_dispatch); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 676, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_9); - __pyx_t_4 = __Pyx_PyObject_Call(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])), __pyx_tuple__23, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 664, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_Call(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])), __pyx_tuple__23, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 676, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __pyx_t_1 = NULL; __pyx_t_7 = 0; @@ -21636,7 +21886,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_9)) { PyObject *__pyx_temp[3] = {__pyx_t_1, __pyx_n_s_on_failed, __pyx_t_4}; - __pyx_t_8 = __Pyx_PyFunction_FastCall(__pyx_t_9, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 664, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyFunction_FastCall(__pyx_t_9, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 676, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; @@ -21645,14 +21895,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_9)) { PyObject *__pyx_temp[3] = {__pyx_t_1, __pyx_n_s_on_failed, __pyx_t_4}; - __pyx_t_8 = __Pyx_PyCFunction_FastCall(__pyx_t_9, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 664, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyCFunction_FastCall(__pyx_t_9, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 676, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; } else #endif { - __pyx_t_5 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 664, __pyx_L1_error) + __pyx_t_5 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 676, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); if (__pyx_t_1) { __Pyx_GIVEREF(__pyx_t_1); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_1); __pyx_t_1 = NULL; @@ -21663,14 +21913,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_5, 1+__pyx_t_7, __pyx_t_4); __pyx_t_4 = 0; - __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_9, __pyx_t_5, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 664, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_9, __pyx_t_5, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 676, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; } __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "kivyblocks/blocks.pyx":665 + /* "kivyblocks/blocks.pyx":677 * desc,type(desc)) * self.dispatch('on_failed',Exception('miss url')) * return # <<<<<<<<<<<<<< @@ -21681,7 +21931,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "kivyblocks/blocks.pyx":660 + /* "kivyblocks/blocks.pyx":672 * * desc = self.getUrlData(url,**opts) * if not (isinstance(desc, DictObject) or \ # <<<<<<<<<<<<<< @@ -21690,24 +21940,24 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS */ } - /* "kivyblocks/blocks.pyx":667 + /* "kivyblocks/blocks.pyx":679 * return * * if addon: # <<<<<<<<<<<<<< * desc = dictExtend(desc,addon) * widgettype = desc.get('widgettype') */ - __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_addon); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 667, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_addon); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 679, __pyx_L1_error) if (__pyx_t_2) { - /* "kivyblocks/blocks.pyx":668 + /* "kivyblocks/blocks.pyx":680 * * if addon: * desc = dictExtend(desc,addon) # <<<<<<<<<<<<<< * widgettype = desc.get('widgettype') * if widgettype is None: */ - __Pyx_GetModuleGlobalName(__pyx_t_9, __pyx_n_s_dictExtend); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 668, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_9, __pyx_n_s_dictExtend); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 680, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_9); __pyx_t_5 = NULL; __pyx_t_7 = 0; @@ -21724,7 +21974,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_9)) { PyObject *__pyx_temp[3] = {__pyx_t_5, __pyx_v_desc, __pyx_v_addon}; - __pyx_t_8 = __Pyx_PyFunction_FastCall(__pyx_t_9, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 668, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyFunction_FastCall(__pyx_t_9, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 680, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_GOTREF(__pyx_t_8); } else @@ -21732,13 +21982,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_9)) { PyObject *__pyx_temp[3] = {__pyx_t_5, __pyx_v_desc, __pyx_v_addon}; - __pyx_t_8 = __Pyx_PyCFunction_FastCall(__pyx_t_9, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 668, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyCFunction_FastCall(__pyx_t_9, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 680, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_GOTREF(__pyx_t_8); } else #endif { - __pyx_t_4 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 668, __pyx_L1_error) + __pyx_t_4 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 680, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); if (__pyx_t_5) { __Pyx_GIVEREF(__pyx_t_5); PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_5); __pyx_t_5 = NULL; @@ -21749,7 +21999,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS __Pyx_INCREF(__pyx_v_addon); __Pyx_GIVEREF(__pyx_v_addon); PyTuple_SET_ITEM(__pyx_t_4, 1+__pyx_t_7, __pyx_v_addon); - __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_9, __pyx_t_4, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 668, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_9, __pyx_t_4, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 680, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; } @@ -21757,7 +22007,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS __Pyx_DECREF_SET(__pyx_v_desc, __pyx_t_8); __pyx_t_8 = 0; - /* "kivyblocks/blocks.pyx":667 + /* "kivyblocks/blocks.pyx":679 * return * * if addon: # <<<<<<<<<<<<<< @@ -21766,14 +22016,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS */ } - /* "kivyblocks/blocks.pyx":669 + /* "kivyblocks/blocks.pyx":681 * if addon: * desc = dictExtend(desc,addon) * widgettype = desc.get('widgettype') # <<<<<<<<<<<<<< * if widgettype is None: * print('Block3: desc must be a dict object not None') */ - __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 669, __pyx_L1_error) + __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_v_desc, __pyx_n_s_get); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 681, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_9); __pyx_t_4 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_9))) { @@ -21787,14 +22037,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS } __pyx_t_8 = (__pyx_t_4) ? __Pyx_PyObject_Call2Args(__pyx_t_9, __pyx_t_4, __pyx_n_s_widgettype) : __Pyx_PyObject_CallOneArg(__pyx_t_9, __pyx_n_s_widgettype); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 669, __pyx_L1_error) + if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 681, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; __Pyx_DECREF_SET(__pyx_v_widgettype, __pyx_t_8); __pyx_t_8 = 0; } - /* "kivyblocks/blocks.pyx":670 + /* "kivyblocks/blocks.pyx":682 * desc = dictExtend(desc,addon) * widgettype = desc.get('widgettype') * if widgettype is None: # <<<<<<<<<<<<<< @@ -21805,16 +22055,16 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS __pyx_t_3 = (__pyx_t_2 != 0); if (__pyx_t_3) { - /* "kivyblocks/blocks.pyx":671 + /* "kivyblocks/blocks.pyx":683 * widgettype = desc.get('widgettype') * if widgettype is None: * print('Block3: desc must be a dict object not None') # <<<<<<<<<<<<<< * return None * return doit(desc) */ - if (__Pyx_PrintOne(0, __pyx_kp_s_Block3_desc_must_be_a_dict_objec) < 0) __PYX_ERR(0, 671, __pyx_L1_error) + if (__Pyx_PrintOne(0, __pyx_kp_s_Block3_desc_must_be_a_dict_objec) < 0) __PYX_ERR(0, 683, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":672 + /* "kivyblocks/blocks.pyx":684 * if widgettype is None: * print('Block3: desc must be a dict object not None') * return None # <<<<<<<<<<<<<< @@ -21825,7 +22075,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "kivyblocks/blocks.pyx":670 + /* "kivyblocks/blocks.pyx":682 * desc = dictExtend(desc,addon) * widgettype = desc.get('widgettype') * if widgettype is None: # <<<<<<<<<<<<<< @@ -21834,7 +22084,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS */ } - /* "kivyblocks/blocks.pyx":673 + /* "kivyblocks/blocks.pyx":685 * print('Block3: desc must be a dict object not None') * return None * return doit(desc) # <<<<<<<<<<<<<< @@ -21842,13 +22092,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS * @classmethod */ __Pyx_XDECREF(__pyx_r); - __pyx_t_8 = __pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(__pyx_v_doit, __pyx_v_desc); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 673, __pyx_L1_error) + __pyx_t_8 = __pyx_pf_10kivyblocks_6blocks_6Blocks_11widgetBuild_doit(__pyx_v_doit, __pyx_v_desc); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 685, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __pyx_r = __pyx_t_8; __pyx_t_8 = 0; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":597 + /* "kivyblocks/blocks.pyx":609 * alert('%s method not found' % method) * * def widgetBuild(self, desc): # <<<<<<<<<<<<<< @@ -21883,7 +22133,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_54widgetBuild(CYTHON_UNUS return __pyx_r; } -/* "kivyblocks/blocks.pyx":676 +/* "kivyblocks/blocks.pyx":688 * * @classmethod * def getWidgetById(self, id:str, from_widget:Widget=None) -> Widget: # <<<<<<<<<<<<<< @@ -21930,7 +22180,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_57getWidgetById(PyObject case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_id)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("getWidgetById", 0, 2, 3, 1); __PYX_ERR(0, 676, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("getWidgetById", 0, 2, 3, 1); __PYX_ERR(0, 688, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: @@ -21940,7 +22190,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_57getWidgetById(PyObject } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "getWidgetById") < 0)) __PYX_ERR(0, 676, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "getWidgetById") < 0)) __PYX_ERR(0, 688, __pyx_L3_error) } } else { switch (PyTuple_GET_SIZE(__pyx_args)) { @@ -21958,13 +22208,13 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_57getWidgetById(PyObject } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("getWidgetById", 0, 2, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 676, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("getWidgetById", 0, 2, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 688, __pyx_L3_error) __pyx_L3_error:; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.getWidgetById", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); return NULL; __pyx_L4_argument_unpacking_done:; - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_id), (&PyString_Type), 1, "id", 1))) __PYX_ERR(0, 676, __pyx_L1_error) + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_id), (&PyString_Type), 1, "id", 1))) __PYX_ERR(0, 688, __pyx_L1_error) __pyx_r = __pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(__pyx_self, __pyx_v_self, __pyx_v_id, __pyx_v_from_widget); /* function exit code */ @@ -21976,7 +22226,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_57getWidgetById(PyObject return __pyx_r; } -/* "kivyblocks/blocks.pyx":677 +/* "kivyblocks/blocks.pyx":689 * @classmethod * def getWidgetById(self, id:str, from_widget:Widget=None) -> Widget: * def find_widget_by_id(id, from_widget): # <<<<<<<<<<<<<< @@ -22019,11 +22269,11 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_13getWidgetById_1find_wid case 1: if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_from_widget)) != 0)) kw_args--; else { - __Pyx_RaiseArgtupleInvalid("find_widget_by_id", 1, 2, 2, 1); __PYX_ERR(0, 677, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("find_widget_by_id", 1, 2, 2, 1); __PYX_ERR(0, 689, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "find_widget_by_id") < 0)) __PYX_ERR(0, 677, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "find_widget_by_id") < 0)) __PYX_ERR(0, 689, __pyx_L3_error) } } else if (PyTuple_GET_SIZE(__pyx_args) != 2) { goto __pyx_L5_argtuple_error; @@ -22036,7 +22286,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_13getWidgetById_1find_wid } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("find_widget_by_id", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 677, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("find_widget_by_id", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 689, __pyx_L3_error) __pyx_L3_error:; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.getWidgetById.find_widget_by_id", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); @@ -22074,17 +22324,17 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg __pyx_outer_scope = (struct __pyx_obj_10kivyblocks_6blocks___pyx_scope_struct_3_getWidgetById *) __Pyx_CyFunction_GetClosure(__pyx_self); __pyx_cur_scope = __pyx_outer_scope; - /* "kivyblocks/blocks.pyx":678 + /* "kivyblocks/blocks.pyx":690 * def getWidgetById(self, id:str, from_widget:Widget=None) -> Widget: * def find_widget_by_id(id, from_widget): * if id=='self': # <<<<<<<<<<<<<< * return from_widget * if hasattr(from_widget,'widget_id'): */ - __pyx_t_1 = (__Pyx_PyString_Equals(__pyx_v_id, __pyx_n_s_self, Py_EQ)); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 678, __pyx_L1_error) + __pyx_t_1 = (__Pyx_PyString_Equals(__pyx_v_id, __pyx_n_s_self, Py_EQ)); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 690, __pyx_L1_error) if (__pyx_t_1) { - /* "kivyblocks/blocks.pyx":679 + /* "kivyblocks/blocks.pyx":691 * def find_widget_by_id(id, from_widget): * if id=='self': * return from_widget # <<<<<<<<<<<<<< @@ -22096,7 +22346,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg __pyx_r = __pyx_v_from_widget; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":678 + /* "kivyblocks/blocks.pyx":690 * def getWidgetById(self, id:str, from_widget:Widget=None) -> Widget: * def find_widget_by_id(id, from_widget): * if id=='self': # <<<<<<<<<<<<<< @@ -22105,33 +22355,33 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg */ } - /* "kivyblocks/blocks.pyx":680 + /* "kivyblocks/blocks.pyx":692 * if id=='self': * return from_widget * if hasattr(from_widget,'widget_id'): # <<<<<<<<<<<<<< * if from_widget.widget_id == id: * return from_widget */ - __pyx_t_1 = __Pyx_HasAttr(__pyx_v_from_widget, __pyx_n_s_widget_id); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 680, __pyx_L1_error) + __pyx_t_1 = __Pyx_HasAttr(__pyx_v_from_widget, __pyx_n_s_widget_id); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 692, __pyx_L1_error) __pyx_t_2 = (__pyx_t_1 != 0); if (__pyx_t_2) { - /* "kivyblocks/blocks.pyx":681 + /* "kivyblocks/blocks.pyx":693 * return from_widget * if hasattr(from_widget,'widget_id'): * if from_widget.widget_id == id: # <<<<<<<<<<<<<< * return from_widget * if id[0] == '-' and from_widget.widget_id == id[1:]: */ - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_from_widget, __pyx_n_s_widget_id); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 681, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_from_widget, __pyx_n_s_widget_id); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 693, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, __pyx_v_id, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 681, __pyx_L1_error) + __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, __pyx_v_id, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 693, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 681, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 693, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; if (__pyx_t_2) { - /* "kivyblocks/blocks.pyx":682 + /* "kivyblocks/blocks.pyx":694 * if hasattr(from_widget,'widget_id'): * if from_widget.widget_id == id: * return from_widget # <<<<<<<<<<<<<< @@ -22143,7 +22393,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg __pyx_r = __pyx_v_from_widget; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":681 + /* "kivyblocks/blocks.pyx":693 * return from_widget * if hasattr(from_widget,'widget_id'): * if from_widget.widget_id == id: # <<<<<<<<<<<<<< @@ -22152,36 +22402,36 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg */ } - /* "kivyblocks/blocks.pyx":683 + /* "kivyblocks/blocks.pyx":695 * if from_widget.widget_id == id: * return from_widget * if id[0] == '-' and from_widget.widget_id == id[1:]: # <<<<<<<<<<<<<< * return from_widget * if hasattr(from_widget, id): */ - __pyx_t_4 = __Pyx_GetItemInt(__pyx_v_id, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 683, __pyx_L1_error) + __pyx_t_4 = __Pyx_GetItemInt(__pyx_v_id, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 695, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_1 = (__Pyx_PyString_Equals(__pyx_t_4, __pyx_kp_s__24, Py_EQ)); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 683, __pyx_L1_error) + __pyx_t_1 = (__Pyx_PyString_Equals(__pyx_t_4, __pyx_kp_s__24, Py_EQ)); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 695, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; if (__pyx_t_1) { } else { __pyx_t_2 = __pyx_t_1; goto __pyx_L7_bool_binop_done; } - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_from_widget, __pyx_n_s_widget_id); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 683, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_from_widget, __pyx_n_s_widget_id); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 695, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_3 = __Pyx_PyObject_GetSlice(__pyx_v_id, 1, 0, NULL, NULL, &__pyx_slice__25, 1, 0, 1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 683, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetSlice(__pyx_v_id, 1, 0, NULL, NULL, &__pyx_slice__25, 1, 0, 1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 695, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_5 = PyObject_RichCompare(__pyx_t_4, __pyx_t_3, Py_EQ); __Pyx_XGOTREF(__pyx_t_5); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 683, __pyx_L1_error) + __pyx_t_5 = PyObject_RichCompare(__pyx_t_4, __pyx_t_3, Py_EQ); __Pyx_XGOTREF(__pyx_t_5); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 695, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 683, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 695, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_t_2 = __pyx_t_1; __pyx_L7_bool_binop_done:; if (__pyx_t_2) { - /* "kivyblocks/blocks.pyx":684 + /* "kivyblocks/blocks.pyx":696 * return from_widget * if id[0] == '-' and from_widget.widget_id == id[1:]: * return from_widget # <<<<<<<<<<<<<< @@ -22193,7 +22443,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg __pyx_r = __pyx_v_from_widget; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":683 + /* "kivyblocks/blocks.pyx":695 * if from_widget.widget_id == id: * return from_widget * if id[0] == '-' and from_widget.widget_id == id[1:]: # <<<<<<<<<<<<<< @@ -22202,7 +22452,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg */ } - /* "kivyblocks/blocks.pyx":680 + /* "kivyblocks/blocks.pyx":692 * if id=='self': * return from_widget * if hasattr(from_widget,'widget_id'): # <<<<<<<<<<<<<< @@ -22211,30 +22461,30 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg */ } - /* "kivyblocks/blocks.pyx":685 + /* "kivyblocks/blocks.pyx":697 * if id[0] == '-' and from_widget.widget_id == id[1:]: * return from_widget * if hasattr(from_widget, id): # <<<<<<<<<<<<<< * w = getattr(from_widget,id) * return w */ - __pyx_t_2 = __Pyx_HasAttr(__pyx_v_from_widget, __pyx_v_id); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 685, __pyx_L1_error) + __pyx_t_2 = __Pyx_HasAttr(__pyx_v_from_widget, __pyx_v_id); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 697, __pyx_L1_error) __pyx_t_1 = (__pyx_t_2 != 0); if (__pyx_t_1) { - /* "kivyblocks/blocks.pyx":686 + /* "kivyblocks/blocks.pyx":698 * return from_widget * if hasattr(from_widget, id): * w = getattr(from_widget,id) # <<<<<<<<<<<<<< * return w * */ - __pyx_t_5 = __Pyx_GetAttr(__pyx_v_from_widget, __pyx_v_id); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 686, __pyx_L1_error) + __pyx_t_5 = __Pyx_GetAttr(__pyx_v_from_widget, __pyx_v_id); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 698, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __pyx_v_w = __pyx_t_5; __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":687 + /* "kivyblocks/blocks.pyx":699 * if hasattr(from_widget, id): * w = getattr(from_widget,id) * return w # <<<<<<<<<<<<<< @@ -22246,7 +22496,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg __pyx_r = __pyx_v_w; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":685 + /* "kivyblocks/blocks.pyx":697 * if id[0] == '-' and from_widget.widget_id == id[1:]: * return from_widget * if hasattr(from_widget, id): # <<<<<<<<<<<<<< @@ -22255,27 +22505,27 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg */ } - /* "kivyblocks/blocks.pyx":689 + /* "kivyblocks/blocks.pyx":701 * return w * * if id[0] == '-': # <<<<<<<<<<<<<< * print('find_widget_by_id(), id=', id, * 'widget=', from_widget) */ - __pyx_t_5 = __Pyx_GetItemInt(__pyx_v_id, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 689, __pyx_L1_error) + __pyx_t_5 = __Pyx_GetItemInt(__pyx_v_id, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 701, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_1 = (__Pyx_PyString_Equals(__pyx_t_5, __pyx_kp_s__24, Py_EQ)); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 689, __pyx_L1_error) + __pyx_t_1 = (__Pyx_PyString_Equals(__pyx_t_5, __pyx_kp_s__24, Py_EQ)); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 701, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; if (__pyx_t_1) { - /* "kivyblocks/blocks.pyx":690 + /* "kivyblocks/blocks.pyx":702 * * if id[0] == '-': * print('find_widget_by_id(), id=', id, # <<<<<<<<<<<<<< * 'widget=', from_widget) * if isinstance(from_widget, WindowBase): */ - __pyx_t_5 = PyTuple_New(4); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 690, __pyx_L1_error) + __pyx_t_5 = PyTuple_New(4); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 702, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_INCREF(__pyx_kp_s_find_widget_by_id_id); __Pyx_GIVEREF(__pyx_kp_s_find_widget_by_id_id); @@ -22289,24 +22539,24 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg __Pyx_INCREF(__pyx_v_from_widget); __Pyx_GIVEREF(__pyx_v_from_widget); PyTuple_SET_ITEM(__pyx_t_5, 3, __pyx_v_from_widget); - if (__Pyx_PrintOne(0, __pyx_t_5) < 0) __PYX_ERR(0, 690, __pyx_L1_error) + if (__Pyx_PrintOne(0, __pyx_t_5) < 0) __PYX_ERR(0, 702, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":692 + /* "kivyblocks/blocks.pyx":704 * print('find_widget_by_id(), id=', id, * 'widget=', from_widget) * if isinstance(from_widget, WindowBase): # <<<<<<<<<<<<<< * return None * if from_widget.parent: */ - __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_WindowBase); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 692, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_WindowBase); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 704, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_1 = PyObject_IsInstance(__pyx_v_from_widget, __pyx_t_5); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 692, __pyx_L1_error) + __pyx_t_1 = PyObject_IsInstance(__pyx_v_from_widget, __pyx_t_5); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 704, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_t_2 = (__pyx_t_1 != 0); if (__pyx_t_2) { - /* "kivyblocks/blocks.pyx":693 + /* "kivyblocks/blocks.pyx":705 * 'widget=', from_widget) * if isinstance(from_widget, WindowBase): * return None # <<<<<<<<<<<<<< @@ -22317,7 +22567,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "kivyblocks/blocks.pyx":692 + /* "kivyblocks/blocks.pyx":704 * print('find_widget_by_id(), id=', id, * 'widget=', from_widget) * if isinstance(from_widget, WindowBase): # <<<<<<<<<<<<<< @@ -22326,20 +22576,20 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg */ } - /* "kivyblocks/blocks.pyx":694 + /* "kivyblocks/blocks.pyx":706 * if isinstance(from_widget, WindowBase): * return None * if from_widget.parent: # <<<<<<<<<<<<<< * return find_widget_by_id(id, * from_widget=from_widget.parent) */ - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_from_widget, __pyx_n_s_parent); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 694, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_from_widget, __pyx_n_s_parent); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 706, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 694, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 706, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; if (__pyx_t_2) { - /* "kivyblocks/blocks.pyx":695 + /* "kivyblocks/blocks.pyx":707 * return None * if from_widget.parent: * return find_widget_by_id(id, # <<<<<<<<<<<<<< @@ -22347,35 +22597,35 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg * return None */ __Pyx_XDECREF(__pyx_r); - if (unlikely(!__pyx_cur_scope->__pyx_v_find_widget_by_id)) { __Pyx_RaiseClosureNameError("find_widget_by_id"); __PYX_ERR(0, 695, __pyx_L1_error) } - __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 695, __pyx_L1_error) + if (unlikely(!__pyx_cur_scope->__pyx_v_find_widget_by_id)) { __Pyx_RaiseClosureNameError("find_widget_by_id"); __PYX_ERR(0, 707, __pyx_L1_error) } + __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 707, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_INCREF(__pyx_v_id); __Pyx_GIVEREF(__pyx_v_id); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_v_id); - /* "kivyblocks/blocks.pyx":696 + /* "kivyblocks/blocks.pyx":708 * if from_widget.parent: * return find_widget_by_id(id, * from_widget=from_widget.parent) # <<<<<<<<<<<<<< * return None * else: */ - __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 696, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 708, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_from_widget, __pyx_n_s_parent); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 696, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_from_widget, __pyx_n_s_parent); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 708, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_from_widget, __pyx_t_4) < 0) __PYX_ERR(0, 696, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_from_widget, __pyx_t_4) < 0) __PYX_ERR(0, 708, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":695 + /* "kivyblocks/blocks.pyx":707 * return None * if from_widget.parent: * return find_widget_by_id(id, # <<<<<<<<<<<<<< * from_widget=from_widget.parent) * return None */ - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_cur_scope->__pyx_v_find_widget_by_id, __pyx_t_5, __pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 695, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_cur_scope->__pyx_v_find_widget_by_id, __pyx_t_5, __pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 707, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -22383,7 +22633,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg __pyx_t_4 = 0; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":694 + /* "kivyblocks/blocks.pyx":706 * if isinstance(from_widget, WindowBase): * return None * if from_widget.parent: # <<<<<<<<<<<<<< @@ -22392,7 +22642,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg */ } - /* "kivyblocks/blocks.pyx":697 + /* "kivyblocks/blocks.pyx":709 * return find_widget_by_id(id, * from_widget=from_widget.parent) * return None # <<<<<<<<<<<<<< @@ -22403,7 +22653,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "kivyblocks/blocks.pyx":689 + /* "kivyblocks/blocks.pyx":701 * return w * * if id[0] == '-': # <<<<<<<<<<<<<< @@ -22412,7 +22662,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg */ } - /* "kivyblocks/blocks.pyx":699 + /* "kivyblocks/blocks.pyx":711 * return None * else: * children = [i for i in from_widget.children] # <<<<<<<<<<<<<< @@ -22420,17 +22670,17 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg * children = from_widget.get_subwidgets() */ /*else*/ { - __pyx_t_4 = PyList_New(0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 699, __pyx_L1_error) + __pyx_t_4 = PyList_New(0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 711, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_from_widget, __pyx_n_s_children); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 699, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_from_widget, __pyx_n_s_children); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 711, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); if (likely(PyList_CheckExact(__pyx_t_3)) || PyTuple_CheckExact(__pyx_t_3)) { __pyx_t_5 = __pyx_t_3; __Pyx_INCREF(__pyx_t_5); __pyx_t_6 = 0; __pyx_t_7 = NULL; } else { - __pyx_t_6 = -1; __pyx_t_5 = PyObject_GetIter(__pyx_t_3); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 699, __pyx_L1_error) + __pyx_t_6 = -1; __pyx_t_5 = PyObject_GetIter(__pyx_t_3); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 711, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_7 = Py_TYPE(__pyx_t_5)->tp_iternext; if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 699, __pyx_L1_error) + __pyx_t_7 = Py_TYPE(__pyx_t_5)->tp_iternext; if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 711, __pyx_L1_error) } __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; for (;;) { @@ -22438,17 +22688,17 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg if (likely(PyList_CheckExact(__pyx_t_5))) { if (__pyx_t_6 >= PyList_GET_SIZE(__pyx_t_5)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_3 = PyList_GET_ITEM(__pyx_t_5, __pyx_t_6); __Pyx_INCREF(__pyx_t_3); __pyx_t_6++; if (unlikely(0 < 0)) __PYX_ERR(0, 699, __pyx_L1_error) + __pyx_t_3 = PyList_GET_ITEM(__pyx_t_5, __pyx_t_6); __Pyx_INCREF(__pyx_t_3); __pyx_t_6++; if (unlikely(0 < 0)) __PYX_ERR(0, 711, __pyx_L1_error) #else - __pyx_t_3 = PySequence_ITEM(__pyx_t_5, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 699, __pyx_L1_error) + __pyx_t_3 = PySequence_ITEM(__pyx_t_5, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 711, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); #endif } else { if (__pyx_t_6 >= PyTuple_GET_SIZE(__pyx_t_5)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_3 = PyTuple_GET_ITEM(__pyx_t_5, __pyx_t_6); __Pyx_INCREF(__pyx_t_3); __pyx_t_6++; if (unlikely(0 < 0)) __PYX_ERR(0, 699, __pyx_L1_error) + __pyx_t_3 = PyTuple_GET_ITEM(__pyx_t_5, __pyx_t_6); __Pyx_INCREF(__pyx_t_3); __pyx_t_6++; if (unlikely(0 < 0)) __PYX_ERR(0, 711, __pyx_L1_error) #else - __pyx_t_3 = PySequence_ITEM(__pyx_t_5, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 699, __pyx_L1_error) + __pyx_t_3 = PySequence_ITEM(__pyx_t_5, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 711, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); #endif } @@ -22458,7 +22708,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg PyObject* exc_type = PyErr_Occurred(); if (exc_type) { if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); - else __PYX_ERR(0, 699, __pyx_L1_error) + else __PYX_ERR(0, 711, __pyx_L1_error) } break; } @@ -22466,31 +22716,31 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg } __Pyx_XDECREF_SET(__pyx_v_i, __pyx_t_3); __pyx_t_3 = 0; - if (unlikely(__Pyx_ListComp_Append(__pyx_t_4, (PyObject*)__pyx_v_i))) __PYX_ERR(0, 699, __pyx_L1_error) + if (unlikely(__Pyx_ListComp_Append(__pyx_t_4, (PyObject*)__pyx_v_i))) __PYX_ERR(0, 711, __pyx_L1_error) } __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_v_children = __pyx_t_4; __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":700 + /* "kivyblocks/blocks.pyx":712 * else: * children = [i for i in from_widget.children] * if hasattr(from_widget, 'get_subwidgets'): # <<<<<<<<<<<<<< * children = from_widget.get_subwidgets() * for c in children: */ - __pyx_t_2 = __Pyx_HasAttr(__pyx_v_from_widget, __pyx_n_s_get_subwidgets); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 700, __pyx_L1_error) + __pyx_t_2 = __Pyx_HasAttr(__pyx_v_from_widget, __pyx_n_s_get_subwidgets); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 712, __pyx_L1_error) __pyx_t_1 = (__pyx_t_2 != 0); if (__pyx_t_1) { - /* "kivyblocks/blocks.pyx":701 + /* "kivyblocks/blocks.pyx":713 * children = [i for i in from_widget.children] * if hasattr(from_widget, 'get_subwidgets'): * children = from_widget.get_subwidgets() # <<<<<<<<<<<<<< * for c in children: * ret = find_widget_by_id(id,from_widget=c) */ - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_from_widget, __pyx_n_s_get_subwidgets); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 701, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_from_widget, __pyx_n_s_get_subwidgets); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 713, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __pyx_t_3 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_5))) { @@ -22504,13 +22754,13 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg } __pyx_t_4 = (__pyx_t_3) ? __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_3) : __Pyx_PyObject_CallNoArg(__pyx_t_5); __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 701, __pyx_L1_error) + if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 713, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF_SET(__pyx_v_children, __pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":700 + /* "kivyblocks/blocks.pyx":712 * else: * children = [i for i in from_widget.children] * if hasattr(from_widget, 'get_subwidgets'): # <<<<<<<<<<<<<< @@ -22519,7 +22769,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg */ } - /* "kivyblocks/blocks.pyx":702 + /* "kivyblocks/blocks.pyx":714 * if hasattr(from_widget, 'get_subwidgets'): * children = from_widget.get_subwidgets() * for c in children: # <<<<<<<<<<<<<< @@ -22530,26 +22780,26 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg __pyx_t_4 = __pyx_v_children; __Pyx_INCREF(__pyx_t_4); __pyx_t_6 = 0; __pyx_t_7 = NULL; } else { - __pyx_t_6 = -1; __pyx_t_4 = PyObject_GetIter(__pyx_v_children); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 702, __pyx_L1_error) + __pyx_t_6 = -1; __pyx_t_4 = PyObject_GetIter(__pyx_v_children); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 714, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_7 = Py_TYPE(__pyx_t_4)->tp_iternext; if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 702, __pyx_L1_error) + __pyx_t_7 = Py_TYPE(__pyx_t_4)->tp_iternext; if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 714, __pyx_L1_error) } for (;;) { if (likely(!__pyx_t_7)) { if (likely(PyList_CheckExact(__pyx_t_4))) { if (__pyx_t_6 >= PyList_GET_SIZE(__pyx_t_4)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_5 = PyList_GET_ITEM(__pyx_t_4, __pyx_t_6); __Pyx_INCREF(__pyx_t_5); __pyx_t_6++; if (unlikely(0 < 0)) __PYX_ERR(0, 702, __pyx_L1_error) + __pyx_t_5 = PyList_GET_ITEM(__pyx_t_4, __pyx_t_6); __Pyx_INCREF(__pyx_t_5); __pyx_t_6++; if (unlikely(0 < 0)) __PYX_ERR(0, 714, __pyx_L1_error) #else - __pyx_t_5 = PySequence_ITEM(__pyx_t_4, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 702, __pyx_L1_error) + __pyx_t_5 = PySequence_ITEM(__pyx_t_4, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 714, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); #endif } else { if (__pyx_t_6 >= PyTuple_GET_SIZE(__pyx_t_4)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_5 = PyTuple_GET_ITEM(__pyx_t_4, __pyx_t_6); __Pyx_INCREF(__pyx_t_5); __pyx_t_6++; if (unlikely(0 < 0)) __PYX_ERR(0, 702, __pyx_L1_error) + __pyx_t_5 = PyTuple_GET_ITEM(__pyx_t_4, __pyx_t_6); __Pyx_INCREF(__pyx_t_5); __pyx_t_6++; if (unlikely(0 < 0)) __PYX_ERR(0, 714, __pyx_L1_error) #else - __pyx_t_5 = PySequence_ITEM(__pyx_t_4, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 702, __pyx_L1_error) + __pyx_t_5 = PySequence_ITEM(__pyx_t_4, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 714, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); #endif } @@ -22559,7 +22809,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg PyObject* exc_type = PyErr_Occurred(); if (exc_type) { if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); - else __PYX_ERR(0, 702, __pyx_L1_error) + else __PYX_ERR(0, 714, __pyx_L1_error) } break; } @@ -22568,40 +22818,40 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg __Pyx_XDECREF_SET(__pyx_v_c, __pyx_t_5); __pyx_t_5 = 0; - /* "kivyblocks/blocks.pyx":703 + /* "kivyblocks/blocks.pyx":715 * children = from_widget.get_subwidgets() * for c in children: * ret = find_widget_by_id(id,from_widget=c) # <<<<<<<<<<<<<< * if ret: * return ret */ - if (unlikely(!__pyx_cur_scope->__pyx_v_find_widget_by_id)) { __Pyx_RaiseClosureNameError("find_widget_by_id"); __PYX_ERR(0, 703, __pyx_L1_error) } - __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 703, __pyx_L1_error) + if (unlikely(!__pyx_cur_scope->__pyx_v_find_widget_by_id)) { __Pyx_RaiseClosureNameError("find_widget_by_id"); __PYX_ERR(0, 715, __pyx_L1_error) } + __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 715, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_INCREF(__pyx_v_id); __Pyx_GIVEREF(__pyx_v_id); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_v_id); - __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 703, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 715, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_from_widget, __pyx_v_c) < 0) __PYX_ERR(0, 703, __pyx_L1_error) - __pyx_t_8 = __Pyx_PyObject_Call(__pyx_cur_scope->__pyx_v_find_widget_by_id, __pyx_t_5, __pyx_t_3); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 703, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_from_widget, __pyx_v_c) < 0) __PYX_ERR(0, 715, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_Call(__pyx_cur_scope->__pyx_v_find_widget_by_id, __pyx_t_5, __pyx_t_3); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 715, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_XDECREF_SET(__pyx_v_ret, __pyx_t_8); __pyx_t_8 = 0; - /* "kivyblocks/blocks.pyx":704 + /* "kivyblocks/blocks.pyx":716 * for c in children: * ret = find_widget_by_id(id,from_widget=c) * if ret: # <<<<<<<<<<<<<< * return ret * return None */ - __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_v_ret); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 704, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_v_ret); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 716, __pyx_L1_error) if (__pyx_t_1) { - /* "kivyblocks/blocks.pyx":705 + /* "kivyblocks/blocks.pyx":717 * ret = find_widget_by_id(id,from_widget=c) * if ret: * return ret # <<<<<<<<<<<<<< @@ -22614,7 +22864,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":704 + /* "kivyblocks/blocks.pyx":716 * for c in children: * ret = find_widget_by_id(id,from_widget=c) * if ret: # <<<<<<<<<<<<<< @@ -22623,7 +22873,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg */ } - /* "kivyblocks/blocks.pyx":702 + /* "kivyblocks/blocks.pyx":714 * if hasattr(from_widget, 'get_subwidgets'): * children = from_widget.get_subwidgets() * for c in children: # <<<<<<<<<<<<<< @@ -22634,7 +22884,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; } - /* "kivyblocks/blocks.pyx":706 + /* "kivyblocks/blocks.pyx":718 * if ret: * return ret * return None # <<<<<<<<<<<<<< @@ -22645,7 +22895,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "kivyblocks/blocks.pyx":677 + /* "kivyblocks/blocks.pyx":689 * @classmethod * def getWidgetById(self, id:str, from_widget:Widget=None) -> Widget: * def find_widget_by_id(id, from_widget): # <<<<<<<<<<<<<< @@ -22672,7 +22922,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widg return __pyx_r; } -/* "kivyblocks/blocks.pyx":676 +/* "kivyblocks/blocks.pyx":688 * * @classmethod * def getWidgetById(self, id:str, from_widget:Widget=None) -> Widget: # <<<<<<<<<<<<<< @@ -22705,48 +22955,48 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(CYTHON_UN if (unlikely(!__pyx_cur_scope)) { __pyx_cur_scope = ((struct __pyx_obj_10kivyblocks_6blocks___pyx_scope_struct_3_getWidgetById *)Py_None); __Pyx_INCREF(Py_None); - __PYX_ERR(0, 676, __pyx_L1_error) + __PYX_ERR(0, 688, __pyx_L1_error) } else { __Pyx_GOTREF(__pyx_cur_scope); } __Pyx_INCREF(__pyx_v_id); __Pyx_INCREF(__pyx_v_from_widget); - /* "kivyblocks/blocks.pyx":677 + /* "kivyblocks/blocks.pyx":689 * @classmethod * def getWidgetById(self, id:str, from_widget:Widget=None) -> Widget: * def find_widget_by_id(id, from_widget): # <<<<<<<<<<<<<< * if id=='self': * return from_widget */ - __pyx_t_1 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_13getWidgetById_1find_widget_by_id, 0, __pyx_n_s_Blocks_getWidgetById_locals_find, ((PyObject*)__pyx_cur_scope), __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__27)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 677, __pyx_L1_error) + __pyx_t_1 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_13getWidgetById_1find_widget_by_id, 0, __pyx_n_s_Blocks_getWidgetById_locals_find, ((PyObject*)__pyx_cur_scope), __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__27)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 689, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_GIVEREF(__pyx_t_1); __pyx_cur_scope->__pyx_v_find_widget_by_id = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":708 + /* "kivyblocks/blocks.pyx":720 * return None * * ids = id.split('.') # <<<<<<<<<<<<<< * app = App.get_running_app() * fid = ids[0] */ - __pyx_t_1 = __Pyx_CallUnboundCMethod1(&__pyx_umethod_PyString_Type_split, __pyx_v_id, __pyx_kp_s__8); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 708, __pyx_L1_error) + __pyx_t_1 = __Pyx_CallUnboundCMethod1(&__pyx_umethod_PyString_Type_split, __pyx_v_id, __pyx_kp_s__8); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 720, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_v_ids = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":709 + /* "kivyblocks/blocks.pyx":721 * * ids = id.split('.') * app = App.get_running_app() # <<<<<<<<<<<<<< * fid = ids[0] * if fid == '/self' or fid == 'root': */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_App); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 709, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_App); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 721, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_get_running_app); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 709, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_get_running_app); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 721, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_t_2 = NULL; @@ -22761,66 +23011,66 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(CYTHON_UN } __pyx_t_1 = (__pyx_t_2) ? __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_2) : __Pyx_PyObject_CallNoArg(__pyx_t_3); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 709, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 721, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_v_app = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":710 + /* "kivyblocks/blocks.pyx":722 * ids = id.split('.') * app = App.get_running_app() * fid = ids[0] # <<<<<<<<<<<<<< * if fid == '/self' or fid == 'root': * from_widget = app.root */ - __pyx_t_1 = __Pyx_GetItemInt(__pyx_v_ids, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 710, __pyx_L1_error) + __pyx_t_1 = __Pyx_GetItemInt(__pyx_v_ids, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 722, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_v_fid = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":711 + /* "kivyblocks/blocks.pyx":723 * app = App.get_running_app() * fid = ids[0] * if fid == '/self' or fid == 'root': # <<<<<<<<<<<<<< * from_widget = app.root * if len(ids) == 1: */ - __pyx_t_5 = (__Pyx_PyString_Equals(__pyx_v_fid, __pyx_kp_s_self_2, Py_EQ)); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 711, __pyx_L1_error) + __pyx_t_5 = (__Pyx_PyString_Equals(__pyx_v_fid, __pyx_kp_s_self_2, Py_EQ)); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 723, __pyx_L1_error) if (!__pyx_t_5) { } else { __pyx_t_4 = __pyx_t_5; goto __pyx_L4_bool_binop_done; } - __pyx_t_5 = (__Pyx_PyString_Equals(__pyx_v_fid, __pyx_n_s_root_2, Py_EQ)); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 711, __pyx_L1_error) + __pyx_t_5 = (__Pyx_PyString_Equals(__pyx_v_fid, __pyx_n_s_root_2, Py_EQ)); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 723, __pyx_L1_error) __pyx_t_4 = __pyx_t_5; __pyx_L4_bool_binop_done:; if (__pyx_t_4) { - /* "kivyblocks/blocks.pyx":712 + /* "kivyblocks/blocks.pyx":724 * fid = ids[0] * if fid == '/self' or fid == 'root': * from_widget = app.root # <<<<<<<<<<<<<< * if len(ids) == 1: * return from_widget */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_app, __pyx_n_s_root_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 712, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_app, __pyx_n_s_root_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 724, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF_SET(__pyx_v_from_widget, __pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":713 + /* "kivyblocks/blocks.pyx":725 * if fid == '/self' or fid == 'root': * from_widget = app.root * if len(ids) == 1: # <<<<<<<<<<<<<< * return from_widget * ids = ids[1:] */ - __pyx_t_6 = PyObject_Length(__pyx_v_ids); if (unlikely(__pyx_t_6 == ((Py_ssize_t)-1))) __PYX_ERR(0, 713, __pyx_L1_error) + __pyx_t_6 = PyObject_Length(__pyx_v_ids); if (unlikely(__pyx_t_6 == ((Py_ssize_t)-1))) __PYX_ERR(0, 725, __pyx_L1_error) __pyx_t_4 = ((__pyx_t_6 == 1) != 0); if (__pyx_t_4) { - /* "kivyblocks/blocks.pyx":714 + /* "kivyblocks/blocks.pyx":726 * from_widget = app.root * if len(ids) == 1: * return from_widget # <<<<<<<<<<<<<< @@ -22832,7 +23082,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(CYTHON_UN __pyx_r = __pyx_v_from_widget; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":713 + /* "kivyblocks/blocks.pyx":725 * if fid == '/self' or fid == 'root': * from_widget = app.root * if len(ids) == 1: # <<<<<<<<<<<<<< @@ -22841,19 +23091,19 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(CYTHON_UN */ } - /* "kivyblocks/blocks.pyx":715 + /* "kivyblocks/blocks.pyx":727 * if len(ids) == 1: * return from_widget * ids = ids[1:] # <<<<<<<<<<<<<< * if fid == 'Window': * from_widget == Window */ - __pyx_t_1 = __Pyx_PyObject_GetSlice(__pyx_v_ids, 1, 0, NULL, NULL, &__pyx_slice__25, 1, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 715, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetSlice(__pyx_v_ids, 1, 0, NULL, NULL, &__pyx_slice__25, 1, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 727, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF_SET(__pyx_v_ids, __pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":711 + /* "kivyblocks/blocks.pyx":723 * app = App.get_running_app() * fid = ids[0] * if fid == '/self' or fid == 'root': # <<<<<<<<<<<<<< @@ -22862,41 +23112,41 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(CYTHON_UN */ } - /* "kivyblocks/blocks.pyx":716 + /* "kivyblocks/blocks.pyx":728 * return from_widget * ids = ids[1:] * if fid == 'Window': # <<<<<<<<<<<<<< * from_widget == Window * if len(ids) == 1: */ - __pyx_t_4 = (__Pyx_PyString_Equals(__pyx_v_fid, __pyx_n_s_Window, Py_EQ)); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 716, __pyx_L1_error) + __pyx_t_4 = (__Pyx_PyString_Equals(__pyx_v_fid, __pyx_n_s_Window, Py_EQ)); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 728, __pyx_L1_error) if (__pyx_t_4) { - /* "kivyblocks/blocks.pyx":717 + /* "kivyblocks/blocks.pyx":729 * ids = ids[1:] * if fid == 'Window': * from_widget == Window # <<<<<<<<<<<<<< * if len(ids) == 1: * return from_widget */ - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_Window); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 717, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_Window); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 729, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyObject_RichCompare(__pyx_v_from_widget, __pyx_t_1, Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 717, __pyx_L1_error) + __pyx_t_3 = PyObject_RichCompare(__pyx_v_from_widget, __pyx_t_1, Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 729, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":718 + /* "kivyblocks/blocks.pyx":730 * if fid == 'Window': * from_widget == Window * if len(ids) == 1: # <<<<<<<<<<<<<< * return from_widget * ids = ids[1:] */ - __pyx_t_6 = PyObject_Length(__pyx_v_ids); if (unlikely(__pyx_t_6 == ((Py_ssize_t)-1))) __PYX_ERR(0, 718, __pyx_L1_error) + __pyx_t_6 = PyObject_Length(__pyx_v_ids); if (unlikely(__pyx_t_6 == ((Py_ssize_t)-1))) __PYX_ERR(0, 730, __pyx_L1_error) __pyx_t_4 = ((__pyx_t_6 == 1) != 0); if (__pyx_t_4) { - /* "kivyblocks/blocks.pyx":719 + /* "kivyblocks/blocks.pyx":731 * from_widget == Window * if len(ids) == 1: * return from_widget # <<<<<<<<<<<<<< @@ -22908,7 +23158,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(CYTHON_UN __pyx_r = __pyx_v_from_widget; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":718 + /* "kivyblocks/blocks.pyx":730 * if fid == 'Window': * from_widget == Window * if len(ids) == 1: # <<<<<<<<<<<<<< @@ -22917,19 +23167,19 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(CYTHON_UN */ } - /* "kivyblocks/blocks.pyx":720 + /* "kivyblocks/blocks.pyx":732 * if len(ids) == 1: * return from_widget * ids = ids[1:] # <<<<<<<<<<<<<< * if fid == 'app': * return app */ - __pyx_t_3 = __Pyx_PyObject_GetSlice(__pyx_v_ids, 1, 0, NULL, NULL, &__pyx_slice__25, 1, 0, 1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 720, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetSlice(__pyx_v_ids, 1, 0, NULL, NULL, &__pyx_slice__25, 1, 0, 1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 732, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF_SET(__pyx_v_ids, __pyx_t_3); __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":716 + /* "kivyblocks/blocks.pyx":728 * return from_widget * ids = ids[1:] * if fid == 'Window': # <<<<<<<<<<<<<< @@ -22938,17 +23188,17 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(CYTHON_UN */ } - /* "kivyblocks/blocks.pyx":721 + /* "kivyblocks/blocks.pyx":733 * return from_widget * ids = ids[1:] * if fid == 'app': # <<<<<<<<<<<<<< * return app * */ - __pyx_t_4 = (__Pyx_PyString_Equals(__pyx_v_fid, __pyx_n_s_app_2, Py_EQ)); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 721, __pyx_L1_error) + __pyx_t_4 = (__Pyx_PyString_Equals(__pyx_v_fid, __pyx_n_s_app_2, Py_EQ)); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 733, __pyx_L1_error) if (__pyx_t_4) { - /* "kivyblocks/blocks.pyx":722 + /* "kivyblocks/blocks.pyx":734 * ids = ids[1:] * if fid == 'app': * return app # <<<<<<<<<<<<<< @@ -22960,7 +23210,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(CYTHON_UN __pyx_r = __pyx_v_app; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":721 + /* "kivyblocks/blocks.pyx":733 * return from_widget * ids = ids[1:] * if fid == 'app': # <<<<<<<<<<<<<< @@ -22969,7 +23219,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(CYTHON_UN */ } - /* "kivyblocks/blocks.pyx":724 + /* "kivyblocks/blocks.pyx":736 * return app * * if from_widget is None: # <<<<<<<<<<<<<< @@ -22980,19 +23230,19 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(CYTHON_UN __pyx_t_5 = (__pyx_t_4 != 0); if (__pyx_t_5) { - /* "kivyblocks/blocks.pyx":725 + /* "kivyblocks/blocks.pyx":737 * * if from_widget is None: * from_widget = app.root # <<<<<<<<<<<<<< * for id in ids: * w = find_widget_by_id(id,from_widget=from_widget) */ - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_app, __pyx_n_s_root_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 725, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_app, __pyx_n_s_root_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 737, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF_SET(__pyx_v_from_widget, __pyx_t_3); __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":724 + /* "kivyblocks/blocks.pyx":736 * return app * * if from_widget is None: # <<<<<<<<<<<<<< @@ -23001,7 +23251,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(CYTHON_UN */ } - /* "kivyblocks/blocks.pyx":726 + /* "kivyblocks/blocks.pyx":738 * if from_widget is None: * from_widget = app.root * for id in ids: # <<<<<<<<<<<<<< @@ -23012,26 +23262,26 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(CYTHON_UN __pyx_t_3 = __pyx_v_ids; __Pyx_INCREF(__pyx_t_3); __pyx_t_6 = 0; __pyx_t_7 = NULL; } else { - __pyx_t_6 = -1; __pyx_t_3 = PyObject_GetIter(__pyx_v_ids); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 726, __pyx_L1_error) + __pyx_t_6 = -1; __pyx_t_3 = PyObject_GetIter(__pyx_v_ids); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 738, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_7 = Py_TYPE(__pyx_t_3)->tp_iternext; if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 726, __pyx_L1_error) + __pyx_t_7 = Py_TYPE(__pyx_t_3)->tp_iternext; if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 738, __pyx_L1_error) } for (;;) { if (likely(!__pyx_t_7)) { if (likely(PyList_CheckExact(__pyx_t_3))) { if (__pyx_t_6 >= PyList_GET_SIZE(__pyx_t_3)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_1 = PyList_GET_ITEM(__pyx_t_3, __pyx_t_6); __Pyx_INCREF(__pyx_t_1); __pyx_t_6++; if (unlikely(0 < 0)) __PYX_ERR(0, 726, __pyx_L1_error) + __pyx_t_1 = PyList_GET_ITEM(__pyx_t_3, __pyx_t_6); __Pyx_INCREF(__pyx_t_1); __pyx_t_6++; if (unlikely(0 < 0)) __PYX_ERR(0, 738, __pyx_L1_error) #else - __pyx_t_1 = PySequence_ITEM(__pyx_t_3, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 726, __pyx_L1_error) + __pyx_t_1 = PySequence_ITEM(__pyx_t_3, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 738, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); #endif } else { if (__pyx_t_6 >= PyTuple_GET_SIZE(__pyx_t_3)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_1 = PyTuple_GET_ITEM(__pyx_t_3, __pyx_t_6); __Pyx_INCREF(__pyx_t_1); __pyx_t_6++; if (unlikely(0 < 0)) __PYX_ERR(0, 726, __pyx_L1_error) + __pyx_t_1 = PyTuple_GET_ITEM(__pyx_t_3, __pyx_t_6); __Pyx_INCREF(__pyx_t_1); __pyx_t_6++; if (unlikely(0 < 0)) __PYX_ERR(0, 738, __pyx_L1_error) #else - __pyx_t_1 = PySequence_ITEM(__pyx_t_3, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 726, __pyx_L1_error) + __pyx_t_1 = PySequence_ITEM(__pyx_t_3, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 738, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); #endif } @@ -23041,39 +23291,39 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(CYTHON_UN PyObject* exc_type = PyErr_Occurred(); if (exc_type) { if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); - else __PYX_ERR(0, 726, __pyx_L1_error) + else __PYX_ERR(0, 738, __pyx_L1_error) } break; } __Pyx_GOTREF(__pyx_t_1); } - if (!(likely(PyString_CheckExact(__pyx_t_1))||((__pyx_t_1) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected %.16s, got %.200s", "str", Py_TYPE(__pyx_t_1)->tp_name), 0))) __PYX_ERR(0, 726, __pyx_L1_error) + if (!(likely(PyString_CheckExact(__pyx_t_1))||((__pyx_t_1) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected %.16s, got %.200s", "str", Py_TYPE(__pyx_t_1)->tp_name), 0))) __PYX_ERR(0, 738, __pyx_L1_error) __Pyx_DECREF_SET(__pyx_v_id, ((PyObject*)__pyx_t_1)); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":727 + /* "kivyblocks/blocks.pyx":739 * from_widget = app.root * for id in ids: * w = find_widget_by_id(id,from_widget=from_widget) # <<<<<<<<<<<<<< * if w is None \ * and id == ids[0] \ */ - __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 727, __pyx_L1_error) + __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 739, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_v_id); __Pyx_GIVEREF(__pyx_v_id); PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_id); - __pyx_t_2 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 727, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 739, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_from_widget, __pyx_v_from_widget) < 0) __PYX_ERR(0, 727, __pyx_L1_error) - __pyx_t_8 = __Pyx_PyObject_Call(__pyx_cur_scope->__pyx_v_find_widget_by_id, __pyx_t_1, __pyx_t_2); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 727, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_from_widget, __pyx_v_from_widget) < 0) __PYX_ERR(0, 739, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_Call(__pyx_cur_scope->__pyx_v_find_widget_by_id, __pyx_t_1, __pyx_t_2); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 739, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_XDECREF_SET(__pyx_v_w, __pyx_t_8); __pyx_t_8 = 0; - /* "kivyblocks/blocks.pyx":728 + /* "kivyblocks/blocks.pyx":740 * for id in ids: * w = find_widget_by_id(id,from_widget=from_widget) * if w is None \ # <<<<<<<<<<<<<< @@ -23088,16 +23338,16 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(CYTHON_UN goto __pyx_L14_bool_binop_done; } - /* "kivyblocks/blocks.pyx":729 + /* "kivyblocks/blocks.pyx":741 * w = find_widget_by_id(id,from_widget=from_widget) * if w is None \ * and id == ids[0] \ # <<<<<<<<<<<<<< * and Window.fullscreen == True \ * and app.root != app.fs_widget: */ - __pyx_t_8 = __Pyx_GetItemInt(__pyx_v_ids, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 729, __pyx_L1_error) + __pyx_t_8 = __Pyx_GetItemInt(__pyx_v_ids, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 741, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); - __pyx_t_9 = (__Pyx_PyString_Equals(__pyx_v_id, __pyx_t_8, Py_EQ)); if (unlikely(__pyx_t_9 < 0)) __PYX_ERR(0, 729, __pyx_L1_error) + __pyx_t_9 = (__Pyx_PyString_Equals(__pyx_v_id, __pyx_t_8, Py_EQ)); if (unlikely(__pyx_t_9 < 0)) __PYX_ERR(0, 741, __pyx_L1_error) __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; if (__pyx_t_9) { } else { @@ -23105,21 +23355,21 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(CYTHON_UN goto __pyx_L14_bool_binop_done; } - /* "kivyblocks/blocks.pyx":730 + /* "kivyblocks/blocks.pyx":742 * if w is None \ * and id == ids[0] \ * and Window.fullscreen == True \ # <<<<<<<<<<<<<< * and app.root != app.fs_widget: * w = find_widget_by_id(id, app.fs_widget) */ - __Pyx_GetModuleGlobalName(__pyx_t_8, __pyx_n_s_Window); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 730, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_8, __pyx_n_s_Window); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 742, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_fullscreen); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 730, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_fullscreen); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 742, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - __pyx_t_8 = PyObject_RichCompare(__pyx_t_2, Py_True, Py_EQ); __Pyx_XGOTREF(__pyx_t_8); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 730, __pyx_L1_error) + __pyx_t_8 = PyObject_RichCompare(__pyx_t_2, Py_True, Py_EQ); __Pyx_XGOTREF(__pyx_t_8); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 742, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_9 = __Pyx_PyObject_IsTrue(__pyx_t_8); if (unlikely(__pyx_t_9 < 0)) __PYX_ERR(0, 730, __pyx_L1_error) + __pyx_t_9 = __Pyx_PyObject_IsTrue(__pyx_t_8); if (unlikely(__pyx_t_9 < 0)) __PYX_ERR(0, 742, __pyx_L1_error) __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; if (__pyx_t_9) { } else { @@ -23127,26 +23377,26 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(CYTHON_UN goto __pyx_L14_bool_binop_done; } - /* "kivyblocks/blocks.pyx":731 + /* "kivyblocks/blocks.pyx":743 * and id == ids[0] \ * and Window.fullscreen == True \ * and app.root != app.fs_widget: # <<<<<<<<<<<<<< * w = find_widget_by_id(id, app.fs_widget) - * if w is None: + * */ - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_app, __pyx_n_s_root_2); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 731, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_app, __pyx_n_s_root_2); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 743, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_app, __pyx_n_s_fs_widget); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 731, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_app, __pyx_n_s_fs_widget); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 743, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_1 = PyObject_RichCompare(__pyx_t_8, __pyx_t_2, Py_NE); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 731, __pyx_L1_error) + __pyx_t_1 = PyObject_RichCompare(__pyx_t_8, __pyx_t_2, Py_NE); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 743, __pyx_L1_error) __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_9 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_9 < 0)) __PYX_ERR(0, 731, __pyx_L1_error) + __pyx_t_9 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_9 < 0)) __PYX_ERR(0, 743, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_t_5 = __pyx_t_9; __pyx_L14_bool_binop_done:; - /* "kivyblocks/blocks.pyx":728 + /* "kivyblocks/blocks.pyx":740 * for id in ids: * w = find_widget_by_id(id,from_widget=from_widget) * if w is None \ # <<<<<<<<<<<<<< @@ -23155,22 +23405,22 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(CYTHON_UN */ if (__pyx_t_5) { - /* "kivyblocks/blocks.pyx":732 + /* "kivyblocks/blocks.pyx":744 * and Window.fullscreen == True \ * and app.root != app.fs_widget: * w = find_widget_by_id(id, app.fs_widget) # <<<<<<<<<<<<<< + * * if w is None: - * print(id, 'not found ....') */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_app, __pyx_n_s_fs_widget); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 732, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_app, __pyx_n_s_fs_widget); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 744, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = __pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widget_by_id(__pyx_cur_scope->__pyx_v_find_widget_by_id, __pyx_v_id, __pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 732, __pyx_L1_error) + __pyx_t_2 = __pyx_pf_10kivyblocks_6blocks_6Blocks_13getWidgetById_find_widget_by_id(__pyx_cur_scope->__pyx_v_find_widget_by_id, __pyx_v_id, __pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 744, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF_SET(__pyx_v_w, __pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":728 + /* "kivyblocks/blocks.pyx":740 * for id in ids: * w = find_widget_by_id(id,from_widget=from_widget) * if w is None \ # <<<<<<<<<<<<<< @@ -23179,9 +23429,9 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(CYTHON_UN */ } - /* "kivyblocks/blocks.pyx":733 - * and app.root != app.fs_widget: + /* "kivyblocks/blocks.pyx":746 * w = find_widget_by_id(id, app.fs_widget) + * * if w is None: # <<<<<<<<<<<<<< * print(id, 'not found ....') * return None @@ -23190,14 +23440,14 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(CYTHON_UN __pyx_t_9 = (__pyx_t_5 != 0); if (__pyx_t_9) { - /* "kivyblocks/blocks.pyx":734 - * w = find_widget_by_id(id, app.fs_widget) + /* "kivyblocks/blocks.pyx":747 + * * if w is None: * print(id, 'not found ....') # <<<<<<<<<<<<<< * return None * from_widget = w */ - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 734, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 747, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_v_id); __Pyx_GIVEREF(__pyx_v_id); @@ -23205,10 +23455,10 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(CYTHON_UN __Pyx_INCREF(__pyx_kp_s_not_found); __Pyx_GIVEREF(__pyx_kp_s_not_found); PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_kp_s_not_found); - if (__Pyx_PrintOne(0, __pyx_t_2) < 0) __PYX_ERR(0, 734, __pyx_L1_error) + if (__Pyx_PrintOne(0, __pyx_t_2) < 0) __PYX_ERR(0, 747, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":735 + /* "kivyblocks/blocks.pyx":748 * if w is None: * print(id, 'not found ....') * return None # <<<<<<<<<<<<<< @@ -23220,16 +23470,16 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(CYTHON_UN __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":733 - * and app.root != app.fs_widget: + /* "kivyblocks/blocks.pyx":746 * w = find_widget_by_id(id, app.fs_widget) + * * if w is None: # <<<<<<<<<<<<<< * print(id, 'not found ....') * return None */ } - /* "kivyblocks/blocks.pyx":736 + /* "kivyblocks/blocks.pyx":749 * print(id, 'not found ....') * return None * from_widget = w # <<<<<<<<<<<<<< @@ -23239,7 +23489,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(CYTHON_UN __Pyx_INCREF(__pyx_v_w); __Pyx_DECREF_SET(__pyx_v_from_widget, __pyx_v_w); - /* "kivyblocks/blocks.pyx":726 + /* "kivyblocks/blocks.pyx":738 * if from_widget is None: * from_widget = app.root * for id in ids: # <<<<<<<<<<<<<< @@ -23249,7 +23499,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(CYTHON_UN } __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "kivyblocks/blocks.pyx":737 + /* "kivyblocks/blocks.pyx":750 * return None * from_widget = w * return w # <<<<<<<<<<<<<< @@ -23257,12 +23507,12 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(CYTHON_UN * def on_built(self,v=None): */ __Pyx_XDECREF(__pyx_r); - if (unlikely(!__pyx_v_w)) { __Pyx_RaiseUnboundLocalError("w"); __PYX_ERR(0, 737, __pyx_L1_error) } + if (unlikely(!__pyx_v_w)) { __Pyx_RaiseUnboundLocalError("w"); __PYX_ERR(0, 750, __pyx_L1_error) } __Pyx_INCREF(__pyx_v_w); __pyx_r = __pyx_v_w; goto __pyx_L0; - /* "kivyblocks/blocks.pyx":676 + /* "kivyblocks/blocks.pyx":688 * * @classmethod * def getWidgetById(self, id:str, from_widget:Widget=None) -> Widget: # <<<<<<<<<<<<<< @@ -23291,7 +23541,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_56getWidgetById(CYTHON_UN return __pyx_r; } -/* "kivyblocks/blocks.pyx":739 +/* "kivyblocks/blocks.pyx":752 * return w * * def on_built(self,v=None): # <<<<<<<<<<<<<< @@ -23339,7 +23589,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_59on_built(PyObject *__py } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "on_built") < 0)) __PYX_ERR(0, 739, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "on_built") < 0)) __PYX_ERR(0, 752, __pyx_L3_error) } } else { switch (PyTuple_GET_SIZE(__pyx_args)) { @@ -23355,7 +23605,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_59on_built(PyObject *__py } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("on_built", 0, 1, 2, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 739, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("on_built", 0, 1, 2, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 752, __pyx_L3_error) __pyx_L3_error:; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.on_built", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); @@ -23373,7 +23623,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_58on_built(CYTHON_UNUSED __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("on_built", 0); - /* "kivyblocks/blocks.pyx":740 + /* "kivyblocks/blocks.pyx":753 * * def on_built(self,v=None): * return # <<<<<<<<<<<<<< @@ -23384,7 +23634,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_58on_built(CYTHON_UNUSED __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "kivyblocks/blocks.pyx":739 + /* "kivyblocks/blocks.pyx":752 * return w * * def on_built(self,v=None): # <<<<<<<<<<<<<< @@ -23399,7 +23649,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_58on_built(CYTHON_UNUSED return __pyx_r; } -/* "kivyblocks/blocks.pyx":742 +/* "kivyblocks/blocks.pyx":755 * return * * def on_failed(self,e=None): # <<<<<<<<<<<<<< @@ -23447,7 +23697,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_61on_failed(PyObject *__p } } if (unlikely(kw_args > 0)) { - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "on_failed") < 0)) __PYX_ERR(0, 742, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "on_failed") < 0)) __PYX_ERR(0, 755, __pyx_L3_error) } } else { switch (PyTuple_GET_SIZE(__pyx_args)) { @@ -23463,7 +23713,7 @@ static PyObject *__pyx_pw_10kivyblocks_6blocks_6Blocks_61on_failed(PyObject *__p } goto __pyx_L4_argument_unpacking_done; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("on_failed", 0, 1, 2, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 742, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("on_failed", 0, 1, 2, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 755, __pyx_L3_error) __pyx_L3_error:; __Pyx_AddTraceback("kivyblocks.blocks.Blocks.on_failed", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); @@ -23481,7 +23731,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_60on_failed(CYTHON_UNUSED __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("on_failed", 0); - /* "kivyblocks/blocks.pyx":743 + /* "kivyblocks/blocks.pyx":756 * * def on_failed(self,e=None): * return # <<<<<<<<<<<<<< @@ -23492,7 +23742,7 @@ static PyObject *__pyx_pf_10kivyblocks_6blocks_6Blocks_60on_failed(CYTHON_UNUSED __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "kivyblocks/blocks.pyx":742 + /* "kivyblocks/blocks.pyx":755 * return * * def on_failed(self,e=None): # <<<<<<<<<<<<<< @@ -24160,12 +24410,14 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_kp_s_Block_desc_s_rfname_s_not_found, __pyx_k_Block_desc_s_rfname_s_not_found, sizeof(__pyx_k_Block_desc_s_rfname_s_not_found), 0, 0, 1, 0}, {&__pyx_kp_s_Block_eventAction_desc_s_miss_di, __pyx_k_Block_eventAction_desc_s_miss_di, sizeof(__pyx_k_Block_eventAction_desc_s_miss_di), 0, 0, 1, 0}, {&__pyx_kp_u_Block_eventAction_dispatch, __pyx_k_Block_eventAction_dispatch, sizeof(__pyx_k_Block_eventAction_dispatch), 0, 1, 0, 0}, + {&__pyx_kp_s_Block_getActionData_desc_s_args, __pyx_k_Block_getActionData_desc_s_args, sizeof(__pyx_k_Block_getActionData_desc_s_args), 0, 0, 1, 0}, {&__pyx_kp_s_Block_get_a_null_function_s, __pyx_k_Block_get_a_null_function_s, sizeof(__pyx_k_Block_get_a_null_function_s), 0, 0, 1, 0}, {&__pyx_kp_s_Block_methodAction_desc_s_method, __pyx_k_Block_methodAction_desc_s_method, sizeof(__pyx_k_Block_methodAction_desc_s_method), 0, 0, 1, 0}, {&__pyx_kp_s_Block_methodAction_desc_s_target, __pyx_k_Block_methodAction_desc_s_target, sizeof(__pyx_k_Block_methodAction_desc_s_target), 0, 0, 1, 0}, {&__pyx_kp_s_Block_s_s, __pyx_k_Block_s_s, sizeof(__pyx_k_Block_s_s), 0, 0, 1, 0}, {&__pyx_kp_s_Block_scriptAction_desc_s_target, __pyx_k_Block_scriptAction_desc_s_target, sizeof(__pyx_k_Block_scriptAction_desc_s_target), 0, 0, 1, 0}, {&__pyx_kp_s_Block_uniaction_called_desc_s_ar, __pyx_k_Block_uniaction_called_desc_s_ar, sizeof(__pyx_k_Block_uniaction_called_desc_s_ar), 0, 0, 1, 0}, + {&__pyx_kp_s_Block_urlwidgetAction_called_des, __pyx_k_Block_urlwidgetAction_called_des, sizeof(__pyx_k_Block_urlwidgetAction_called_des), 0, 0, 1, 0}, {&__pyx_kp_s_Block_urlwidgetAction_desc_s_wid, __pyx_k_Block_urlwidgetAction_desc_s_wid, sizeof(__pyx_k_Block_urlwidgetAction_desc_s_wid), 0, 0, 1, 0}, {&__pyx_kp_s_Block_w_build_desc_invalid, __pyx_k_Block_w_build_desc_invalid, sizeof(__pyx_k_Block_w_build_desc_invalid), 0, 0, 1, 0}, {&__pyx_n_s_Blocks, __pyx_k_Blocks, sizeof(__pyx_k_Blocks), 0, 0, 1, 1}, @@ -24228,6 +24480,7 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_n_s_Layout, __pyx_k_Layout, sizeof(__pyx_k_Layout), 0, 0, 1, 1}, {&__pyx_n_s_Logger, __pyx_k_Logger, sizeof(__pyx_k_Logger), 0, 0, 1, 1}, {&__pyx_kp_s_Method_s_not_found_in_class_s, __pyx_k_Method_s_not_found_in_class_s, sizeof(__pyx_k_Method_s_not_found_in_class_s), 0, 0, 1, 0}, + {&__pyx_n_s_ModalView, __pyx_k_ModalView, sizeof(__pyx_k_ModalView), 0, 0, 1, 1}, {&__pyx_n_s_NotExistsObject, __pyx_k_NotExistsObject, sizeof(__pyx_k_NotExistsObject), 0, 0, 1, 1}, {&__pyx_n_s_NotExistsObject___expr, __pyx_k_NotExistsObject___expr, sizeof(__pyx_k_NotExistsObject___expr), 0, 0, 1, 1}, {&__pyx_n_s_NotExistsObject___init, __pyx_k_NotExistsObject___init, sizeof(__pyx_k_NotExistsObject___init), 0, 0, 1, 1}, @@ -24389,7 +24642,6 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_n_s_k, __pyx_k_k, sizeof(__pyx_k_k), 0, 0, 1, 1}, {&__pyx_n_s_keyMapping, __pyx_k_keyMapping, sizeof(__pyx_k_keyMapping), 0, 0, 1, 1}, {&__pyx_n_s_keymapping, __pyx_k_keymapping, sizeof(__pyx_k_keymapping), 0, 0, 1, 1}, - {&__pyx_n_s_kivy, __pyx_k_kivy, sizeof(__pyx_k_kivy), 0, 0, 1, 1}, {&__pyx_n_s_kivy_app, __pyx_k_kivy_app, sizeof(__pyx_k_kivy_app), 0, 0, 1, 1}, {&__pyx_n_s_kivy_config, __pyx_k_kivy_config, sizeof(__pyx_k_kivy_config), 0, 0, 1, 1}, {&__pyx_n_s_kivy_core_window, __pyx_k_kivy_core_window, sizeof(__pyx_k_kivy_core_window), 0, 0, 1, 1}, @@ -24397,6 +24649,7 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_n_s_kivy_logger, __pyx_k_kivy_logger, sizeof(__pyx_k_kivy_logger), 0, 0, 1, 1}, {&__pyx_n_s_kivy_metrics, __pyx_k_kivy_metrics, sizeof(__pyx_k_kivy_metrics), 0, 0, 1, 1}, {&__pyx_n_s_kivy_properties, __pyx_k_kivy_properties, sizeof(__pyx_k_kivy_properties), 0, 0, 1, 1}, + {&__pyx_n_s_kivy_uix_modalview, __pyx_k_kivy_uix_modalview, sizeof(__pyx_k_kivy_uix_modalview), 0, 0, 1, 1}, {&__pyx_n_s_kivy_uix_video, __pyx_k_kivy_uix_video, sizeof(__pyx_k_kivy_uix_video), 0, 0, 1, 1}, {&__pyx_n_s_kivy_uix_widget, __pyx_k_kivy_uix_widget, sizeof(__pyx_k_kivy_uix_widget), 0, 0, 1, 1}, {&__pyx_n_s_kivyblocks_blocks, __pyx_k_kivyblocks_blocks, sizeof(__pyx_k_kivyblocks_blocks), 0, 0, 1, 1}, @@ -24532,9 +24785,9 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { }; static CYTHON_SMALL_CODE int __Pyx_InitCachedBuiltins(void) { __pyx_builtin_super = __Pyx_GetBuiltinName(__pyx_n_s_super); if (!__pyx_builtin_super) __PYX_ERR(0, 43, __pyx_L1_error) - __pyx_builtin_eval = __Pyx_GetBuiltinName(__pyx_n_s_eval); if (!__pyx_builtin_eval) __PYX_ERR(0, 152, __pyx_L1_error) - __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) __PYX_ERR(0, 306, __pyx_L1_error) - __pyx_builtin_enumerate = __Pyx_GetBuiltinName(__pyx_n_s_enumerate); if (!__pyx_builtin_enumerate) __PYX_ERR(0, 308, __pyx_L1_error) + __pyx_builtin_eval = __Pyx_GetBuiltinName(__pyx_n_s_eval); if (!__pyx_builtin_eval) __PYX_ERR(0, 151, __pyx_L1_error) + __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) __PYX_ERR(0, 305, __pyx_L1_error) + __pyx_builtin_enumerate = __Pyx_GetBuiltinName(__pyx_n_s_enumerate); if (!__pyx_builtin_enumerate) __PYX_ERR(0, 307, __pyx_L1_error) return 0; __pyx_L1_error:; return -1; @@ -24544,198 +24797,198 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0); - /* "kivyblocks/blocks.pyx":161 + /* "kivyblocks/blocks.pyx":160 * if url is None: * if errback: * errback(None,Exception('url is None')) # <<<<<<<<<<<<<< * else: * return None */ - __pyx_tuple__2 = PyTuple_Pack(1, __pyx_kp_s_url_is_None); if (unlikely(!__pyx_tuple__2)) __PYX_ERR(0, 161, __pyx_L1_error) + __pyx_tuple__2 = PyTuple_Pack(1, __pyx_kp_s_url_is_None); if (unlikely(!__pyx_tuple__2)) __PYX_ERR(0, 160, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__2); __Pyx_GIVEREF(__pyx_tuple__2); - /* "kivyblocks/blocks.pyx":167 + /* "kivyblocks/blocks.pyx":166 * if url.startswith('file://'): * filename = url[7:] * with codecs.open(filename,'r','utf-8') as f: # <<<<<<<<<<<<<< * b = f.read() * dic = json.loads(b) */ - __pyx_tuple__3 = PyTuple_Pack(3, Py_None, Py_None, Py_None); if (unlikely(!__pyx_tuple__3)) __PYX_ERR(0, 167, __pyx_L1_error) + __pyx_tuple__3 = PyTuple_Pack(3, Py_None, Py_None, Py_None); if (unlikely(!__pyx_tuple__3)) __PYX_ERR(0, 166, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__3); __Pyx_GIVEREF(__pyx_tuple__3); - /* "kivyblocks/blocks.pyx":250 + /* "kivyblocks/blocks.pyx":249 * def w_build(self,desc) -> Widget: * # print('w_build(),desc=',desc) * widgetClass = desc.get('widgettype',None) # <<<<<<<<<<<<<< * if not widgetClass: * Logger.info("Block: w_build(), desc invalid", desc) */ - __pyx_tuple__5 = PyTuple_Pack(2, __pyx_n_s_widgettype, Py_None); if (unlikely(!__pyx_tuple__5)) __PYX_ERR(0, 250, __pyx_L1_error) + __pyx_tuple__5 = PyTuple_Pack(2, __pyx_n_s_widgettype, Py_None); if (unlikely(!__pyx_tuple__5)) __PYX_ERR(0, 249, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__5); __Pyx_GIVEREF(__pyx_tuple__5); - /* "kivyblocks/blocks.pyx":270 + /* "kivyblocks/blocks.pyx":269 * if id.startswith('app.'): * app = App.get_running_app() * id = id[4:] # <<<<<<<<<<<<<< * setattr(app, id, widget) * if id.startswith('root.'): */ - __pyx_slice__6 = PySlice_New(__pyx_int_4, Py_None, Py_None); if (unlikely(!__pyx_slice__6)) __PYX_ERR(0, 270, __pyx_L1_error) + __pyx_slice__6 = PySlice_New(__pyx_int_4, Py_None, Py_None); if (unlikely(!__pyx_slice__6)) __PYX_ERR(0, 269, __pyx_L1_error) __Pyx_GOTREF(__pyx_slice__6); __Pyx_GIVEREF(__pyx_slice__6); - /* "kivyblocks/blocks.pyx":274 + /* "kivyblocks/blocks.pyx":273 * if id.startswith('root.'): * app = App.get_running_app() * id = id[5:] # <<<<<<<<<<<<<< * setattr(app.root, id, widget) * */ - __pyx_slice__7 = PySlice_New(__pyx_int_5, Py_None, Py_None); if (unlikely(!__pyx_slice__7)) __PYX_ERR(0, 274, __pyx_L1_error) + __pyx_slice__7 = PySlice_New(__pyx_int_5, Py_None, Py_None); if (unlikely(!__pyx_slice__7)) __PYX_ERR(0, 273, __pyx_L1_error) __Pyx_GOTREF(__pyx_slice__7); __Pyx_GIVEREF(__pyx_slice__7); - /* "kivyblocks/blocks.pyx":321 + /* "kivyblocks/blocks.pyx":320 * * def buildBind(self, widget:Widget, desc): * wid = desc.get('wid','self') # <<<<<<<<<<<<<< * w = Blocks.getWidgetById(desc.get('wid','self'),from_widget=widget) * if not w: */ - __pyx_tuple__9 = PyTuple_Pack(2, __pyx_n_s_wid, __pyx_n_s_self); if (unlikely(!__pyx_tuple__9)) __PYX_ERR(0, 321, __pyx_L1_error) + __pyx_tuple__9 = PyTuple_Pack(2, __pyx_n_s_wid, __pyx_n_s_self); if (unlikely(!__pyx_tuple__9)) __PYX_ERR(0, 320, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__9); __Pyx_GIVEREF(__pyx_tuple__9); - /* "kivyblocks/blocks.pyx":408 + /* "kivyblocks/blocks.pyx":407 * def blocksAction(self, widget:Widget, desc, *args): * target = self.get_target(widget, desc) * add_mode = desc.get('mode','replace') # <<<<<<<<<<<<<< * opts = desc.get('options').copy() * d = self.getActionData(widget,desc, *args) */ - __pyx_tuple__10 = PyTuple_Pack(2, __pyx_n_s_mode, __pyx_n_s_replace); if (unlikely(!__pyx_tuple__10)) __PYX_ERR(0, 408, __pyx_L1_error) + __pyx_tuple__10 = PyTuple_Pack(2, __pyx_n_s_mode, __pyx_n_s_replace); if (unlikely(!__pyx_tuple__10)) __PYX_ERR(0, 407, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__10); __Pyx_GIVEREF(__pyx_tuple__10); - /* "kivyblocks/blocks.pyx":415 + /* "kivyblocks/blocks.pyx":414 * p.update(d) * opts['options'] = p * def doit(target:Widget, add_mode:str, o, w:Widget): # <<<<<<<<<<<<<< - * if target: - * if add_mode == 'replace': + * if isinstance(w, ModalView): + * return */ - __pyx_tuple__11 = PyTuple_Pack(4, __pyx_n_s_target, __pyx_n_s_add_mode, __pyx_n_s_o, __pyx_n_s_w); if (unlikely(!__pyx_tuple__11)) __PYX_ERR(0, 415, __pyx_L1_error) + __pyx_tuple__11 = PyTuple_Pack(4, __pyx_n_s_target, __pyx_n_s_add_mode, __pyx_n_s_o, __pyx_n_s_w); if (unlikely(!__pyx_tuple__11)) __PYX_ERR(0, 414, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__11); __Pyx_GIVEREF(__pyx_tuple__11); - __pyx_codeobj__12 = (PyObject*)__Pyx_PyCode_New(4, 0, 4, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__11, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_doit, 415, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__12)) __PYX_ERR(0, 415, __pyx_L1_error) + __pyx_codeobj__12 = (PyObject*)__Pyx_PyCode_New(4, 0, 4, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__11, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_doit, 414, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__12)) __PYX_ERR(0, 414, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":421 + /* "kivyblocks/blocks.pyx":423 * target.add_widget(w) * * def doerr(o,e): # <<<<<<<<<<<<<< * Logger.info('Block: blocksAction(): desc=%s widgetBuild error' * ,str(desc)) */ - __pyx_tuple__13 = PyTuple_Pack(2, __pyx_n_s_o, __pyx_n_s_e); if (unlikely(!__pyx_tuple__13)) __PYX_ERR(0, 421, __pyx_L1_error) + __pyx_tuple__13 = PyTuple_Pack(2, __pyx_n_s_o, __pyx_n_s_e); if (unlikely(!__pyx_tuple__13)) __PYX_ERR(0, 423, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__13); __Pyx_GIVEREF(__pyx_tuple__13); - __pyx_codeobj__14 = (PyObject*)__Pyx_PyCode_New(2, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__13, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_doerr, 421, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__14)) __PYX_ERR(0, 421, __pyx_L1_error) + __pyx_codeobj__14 = (PyObject*)__Pyx_PyCode_New(2, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__13, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_doerr, 423, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__14)) __PYX_ERR(0, 423, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":447 + /* "kivyblocks/blocks.pyx":453 * } * * def doit(target:Widget, add_mode:str, o, w:Widget): # <<<<<<<<<<<<<< - * if target: - * if add_mode == 'replace': + * if isinstance(w, ModalView): + * return */ - __pyx_tuple__15 = PyTuple_Pack(4, __pyx_n_s_target, __pyx_n_s_add_mode, __pyx_n_s_o, __pyx_n_s_w); if (unlikely(!__pyx_tuple__15)) __PYX_ERR(0, 447, __pyx_L1_error) + __pyx_tuple__15 = PyTuple_Pack(4, __pyx_n_s_target, __pyx_n_s_add_mode, __pyx_n_s_o, __pyx_n_s_w); if (unlikely(!__pyx_tuple__15)) __PYX_ERR(0, 453, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__15); __Pyx_GIVEREF(__pyx_tuple__15); - __pyx_codeobj__16 = (PyObject*)__Pyx_PyCode_New(4, 0, 4, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__15, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_doit, 447, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__16)) __PYX_ERR(0, 447, __pyx_L1_error) + __pyx_codeobj__16 = (PyObject*)__Pyx_PyCode_New(4, 0, 4, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__15, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_doit, 453, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__16)) __PYX_ERR(0, 453, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":453 + /* "kivyblocks/blocks.pyx":462 * target.add_widget(w) * * def doerr(o,e): # <<<<<<<<<<<<<< * Logger.info('Block: urlwidgetAction(): desc=%s widgetBuild error' * ,str(desc)) */ - __pyx_tuple__17 = PyTuple_Pack(2, __pyx_n_s_o, __pyx_n_s_e); if (unlikely(!__pyx_tuple__17)) __PYX_ERR(0, 453, __pyx_L1_error) + __pyx_tuple__17 = PyTuple_Pack(2, __pyx_n_s_o, __pyx_n_s_e); if (unlikely(!__pyx_tuple__17)) __PYX_ERR(0, 462, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__17); __Pyx_GIVEREF(__pyx_tuple__17); - __pyx_codeobj__18 = (PyObject*)__Pyx_PyCode_New(2, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__17, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_doerr, 453, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__18)) __PYX_ERR(0, 453, __pyx_L1_error) + __pyx_codeobj__18 = (PyObject*)__Pyx_PyCode_New(2, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__17, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_doerr, 462, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__18)) __PYX_ERR(0, 462, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":517 + /* "kivyblocks/blocks.pyx":531 * rtdesc['script'] = desc.get('datacript') * else: * rtdesc['method'] = desc.get('datamethod', 'getValue') # <<<<<<<<<<<<<< * rtdesc['kwargs'] = desc.get('datakwargs', {}) - * else: + * return rtdesc */ - __pyx_tuple__19 = PyTuple_Pack(2, __pyx_n_s_datamethod, __pyx_n_s_getValue); if (unlikely(!__pyx_tuple__19)) __PYX_ERR(0, 517, __pyx_L1_error) + __pyx_tuple__19 = PyTuple_Pack(2, __pyx_n_s_datamethod, __pyx_n_s_getValue); if (unlikely(!__pyx_tuple__19)) __PYX_ERR(0, 531, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__19); __Pyx_GIVEREF(__pyx_tuple__19); - /* "kivyblocks/blocks.pyx":559 + /* "kivyblocks/blocks.pyx":571 * return d * * method = desc.get('method', 'getValue') # <<<<<<<<<<<<<< * if not hasattr(w, method): * print('get_rtdata():method is None', desc, type(w)) */ - __pyx_tuple__20 = PyTuple_Pack(2, __pyx_n_s_method, __pyx_n_s_getValue); if (unlikely(!__pyx_tuple__20)) __PYX_ERR(0, 559, __pyx_L1_error) + __pyx_tuple__20 = PyTuple_Pack(2, __pyx_n_s_method, __pyx_n_s_getValue); if (unlikely(!__pyx_tuple__20)) __PYX_ERR(0, 571, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__20); __Pyx_GIVEREF(__pyx_tuple__20); - /* "kivyblocks/blocks.pyx":610 + /* "kivyblocks/blocks.pyx":622 * } * """ * def doit(desc): # <<<<<<<<<<<<<< * if isinstance(desc,DictObject): * desc = desc.to_dict() */ - __pyx_tuple__21 = PyTuple_Pack(3, __pyx_n_s_desc, __pyx_n_s_widget, __pyx_n_s_e); if (unlikely(!__pyx_tuple__21)) __PYX_ERR(0, 610, __pyx_L1_error) + __pyx_tuple__21 = PyTuple_Pack(3, __pyx_n_s_desc, __pyx_n_s_widget, __pyx_n_s_e); if (unlikely(!__pyx_tuple__21)) __PYX_ERR(0, 622, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__21); __Pyx_GIVEREF(__pyx_tuple__21); - __pyx_codeobj__22 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__21, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_doit, 610, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__22)) __PYX_ERR(0, 610, __pyx_L1_error) + __pyx_codeobj__22 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__21, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_doit, 622, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__22)) __PYX_ERR(0, 622, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":635 + /* "kivyblocks/blocks.pyx":647 * print('widgetBuild1: desc must be a dict object', * desc,type(desc)) * self.dispatch('on_failed',Exception('miss url')) # <<<<<<<<<<<<<< * return * */ - __pyx_tuple__23 = PyTuple_Pack(1, __pyx_kp_s_miss_url); if (unlikely(!__pyx_tuple__23)) __PYX_ERR(0, 635, __pyx_L1_error) + __pyx_tuple__23 = PyTuple_Pack(1, __pyx_kp_s_miss_url); if (unlikely(!__pyx_tuple__23)) __PYX_ERR(0, 647, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__23); __Pyx_GIVEREF(__pyx_tuple__23); - /* "kivyblocks/blocks.pyx":683 + /* "kivyblocks/blocks.pyx":695 * if from_widget.widget_id == id: * return from_widget * if id[0] == '-' and from_widget.widget_id == id[1:]: # <<<<<<<<<<<<<< * return from_widget * if hasattr(from_widget, id): */ - __pyx_slice__25 = PySlice_New(__pyx_int_1, Py_None, Py_None); if (unlikely(!__pyx_slice__25)) __PYX_ERR(0, 683, __pyx_L1_error) + __pyx_slice__25 = PySlice_New(__pyx_int_1, Py_None, Py_None); if (unlikely(!__pyx_slice__25)) __PYX_ERR(0, 695, __pyx_L1_error) __Pyx_GOTREF(__pyx_slice__25); __Pyx_GIVEREF(__pyx_slice__25); - /* "kivyblocks/blocks.pyx":677 + /* "kivyblocks/blocks.pyx":689 * @classmethod * def getWidgetById(self, id:str, from_widget:Widget=None) -> Widget: * def find_widget_by_id(id, from_widget): # <<<<<<<<<<<<<< * if id=='self': * return from_widget */ - __pyx_tuple__26 = PyTuple_Pack(7, __pyx_n_s_id, __pyx_n_s_from_widget, __pyx_n_s_w, __pyx_n_s_children, __pyx_n_s_c, __pyx_n_s_ret_2, __pyx_n_s_i); if (unlikely(!__pyx_tuple__26)) __PYX_ERR(0, 677, __pyx_L1_error) + __pyx_tuple__26 = PyTuple_Pack(7, __pyx_n_s_id, __pyx_n_s_from_widget, __pyx_n_s_w, __pyx_n_s_children, __pyx_n_s_c, __pyx_n_s_ret_2, __pyx_n_s_i); if (unlikely(!__pyx_tuple__26)) __PYX_ERR(0, 689, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__26); __Pyx_GIVEREF(__pyx_tuple__26); - __pyx_codeobj__27 = (PyObject*)__Pyx_PyCode_New(2, 0, 7, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__26, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_find_widget_by_id, 677, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__27)) __PYX_ERR(0, 677, __pyx_L1_error) + __pyx_codeobj__27 = (PyObject*)__Pyx_PyCode_New(2, 0, 7, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__26, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_find_widget_by_id, 689, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__27)) __PYX_ERR(0, 689, __pyx_L1_error) /* "kivyblocks/blocks.pyx":42 * @@ -24977,342 +25230,342 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { __Pyx_GIVEREF(__pyx_tuple__67); __pyx_codeobj__68 = (PyObject*)__Pyx_PyCode_New(3, 0, 6, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__67, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_buildAction, 123, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__68)) __PYX_ERR(0, 123, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":132 - * + /* "kivyblocks/blocks.pyx":131 + * return func * * def eval(self, s:str, l:dict): # <<<<<<<<<<<<<< * g = {} * forbidens = [ */ - __pyx_tuple__69 = PyTuple_Pack(7, __pyx_n_s_self, __pyx_n_s_s, __pyx_n_s_l, __pyx_n_s_g, __pyx_n_s_forbidens, __pyx_n_s_k, __pyx_n_s_v); if (unlikely(!__pyx_tuple__69)) __PYX_ERR(0, 132, __pyx_L1_error) + __pyx_tuple__69 = PyTuple_Pack(7, __pyx_n_s_self, __pyx_n_s_s, __pyx_n_s_l, __pyx_n_s_g, __pyx_n_s_forbidens, __pyx_n_s_k, __pyx_n_s_v); if (unlikely(!__pyx_tuple__69)) __PYX_ERR(0, 131, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__69); __Pyx_GIVEREF(__pyx_tuple__69); - __pyx_codeobj__70 = (PyObject*)__Pyx_PyCode_New(3, 0, 7, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__69, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_eval, 132, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__70)) __PYX_ERR(0, 132, __pyx_L1_error) + __pyx_codeobj__70 = (PyObject*)__Pyx_PyCode_New(3, 0, 7, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__69, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_eval, 131, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__70)) __PYX_ERR(0, 131, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":154 + /* "kivyblocks/blocks.pyx":153 * return eval(s,g,l) * * def getUrlData(self, url:str, method:str='GET', # <<<<<<<<<<<<<< * params:dict={}, files:dict={}, * callback=None, */ - __pyx_tuple__71 = PyTuple_Pack(16, __pyx_n_s_self, __pyx_n_s_url, __pyx_n_s_method, __pyx_n_s_params, __pyx_n_s_files, __pyx_n_s_callback, __pyx_n_s_errback, __pyx_n_s_kw, __pyx_n_s_filename, __pyx_n_s_f, __pyx_n_s_b, __pyx_n_s_dic, __pyx_n_s_hc, __pyx_n_s_resp, __pyx_n_s_e, __pyx_n_s_config); if (unlikely(!__pyx_tuple__71)) __PYX_ERR(0, 154, __pyx_L1_error) + __pyx_tuple__71 = PyTuple_Pack(16, __pyx_n_s_self, __pyx_n_s_url, __pyx_n_s_method, __pyx_n_s_params, __pyx_n_s_files, __pyx_n_s_callback, __pyx_n_s_errback, __pyx_n_s_kw, __pyx_n_s_filename, __pyx_n_s_f, __pyx_n_s_b, __pyx_n_s_dic, __pyx_n_s_hc, __pyx_n_s_resp, __pyx_n_s_e, __pyx_n_s_config); if (unlikely(!__pyx_tuple__71)) __PYX_ERR(0, 153, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__71); __Pyx_GIVEREF(__pyx_tuple__71); - __pyx_codeobj__72 = (PyObject*)__Pyx_PyCode_New(7, 0, 16, 0, CO_OPTIMIZED|CO_NEWLOCALS|CO_VARKEYWORDS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__71, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_getUrlData, 154, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__72)) __PYX_ERR(0, 154, __pyx_L1_error) + __pyx_codeobj__72 = (PyObject*)__Pyx_PyCode_New(7, 0, 16, 0, CO_OPTIMIZED|CO_NEWLOCALS|CO_VARKEYWORDS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__71, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_getUrlData, 153, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__72)) __PYX_ERR(0, 153, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":190 + /* "kivyblocks/blocks.pyx":189 * **kw) * * def strValueExpr(self,s:str,localnamespace:dict={}): # <<<<<<<<<<<<<< * if not s.startswith('py::'): * return s */ - __pyx_tuple__73 = PyTuple_Pack(5, __pyx_n_s_self, __pyx_n_s_s, __pyx_n_s_localnamespace, __pyx_n_s_v, __pyx_n_s_e); if (unlikely(!__pyx_tuple__73)) __PYX_ERR(0, 190, __pyx_L1_error) + __pyx_tuple__73 = PyTuple_Pack(5, __pyx_n_s_self, __pyx_n_s_s, __pyx_n_s_localnamespace, __pyx_n_s_v, __pyx_n_s_e); if (unlikely(!__pyx_tuple__73)) __PYX_ERR(0, 189, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__73); __Pyx_GIVEREF(__pyx_tuple__73); - __pyx_codeobj__74 = (PyObject*)__Pyx_PyCode_New(3, 0, 5, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__73, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_strValueExpr, 190, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__74)) __PYX_ERR(0, 190, __pyx_L1_error) + __pyx_codeobj__74 = (PyObject*)__Pyx_PyCode_New(3, 0, 5, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__73, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_strValueExpr, 189, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__74)) __PYX_ERR(0, 189, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":202 + /* "kivyblocks/blocks.pyx":201 * return s * * def arrayValueExpr(self,arr:list,localnamespace:dict={}) -> list: # <<<<<<<<<<<<<< * d = [] * for v in arr: */ - __pyx_tuple__75 = PyTuple_Pack(5, __pyx_n_s_self, __pyx_n_s_arr, __pyx_n_s_localnamespace, __pyx_n_s_d, __pyx_n_s_v); if (unlikely(!__pyx_tuple__75)) __PYX_ERR(0, 202, __pyx_L1_error) + __pyx_tuple__75 = PyTuple_Pack(5, __pyx_n_s_self, __pyx_n_s_arr, __pyx_n_s_localnamespace, __pyx_n_s_d, __pyx_n_s_v); if (unlikely(!__pyx_tuple__75)) __PYX_ERR(0, 201, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__75); __Pyx_GIVEREF(__pyx_tuple__75); - __pyx_codeobj__76 = (PyObject*)__Pyx_PyCode_New(3, 0, 5, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__75, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_arrayValueExpr, 202, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__76)) __PYX_ERR(0, 202, __pyx_L1_error) + __pyx_codeobj__76 = (PyObject*)__Pyx_PyCode_New(3, 0, 5, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__75, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_arrayValueExpr, 201, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__76)) __PYX_ERR(0, 201, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":220 + /* "kivyblocks/blocks.pyx":219 * return d * * def dictValueExpr(self,dic:dict,localnamespace:dict={}) -> dict: # <<<<<<<<<<<<<< * d = {} * for k,v in dic.items(): */ - __pyx_tuple__77 = PyTuple_Pack(6, __pyx_n_s_self, __pyx_n_s_dic, __pyx_n_s_localnamespace, __pyx_n_s_d, __pyx_n_s_k, __pyx_n_s_v); if (unlikely(!__pyx_tuple__77)) __PYX_ERR(0, 220, __pyx_L1_error) + __pyx_tuple__77 = PyTuple_Pack(6, __pyx_n_s_self, __pyx_n_s_dic, __pyx_n_s_localnamespace, __pyx_n_s_d, __pyx_n_s_k, __pyx_n_s_v); if (unlikely(!__pyx_tuple__77)) __PYX_ERR(0, 219, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__77); __Pyx_GIVEREF(__pyx_tuple__77); - __pyx_codeobj__78 = (PyObject*)__Pyx_PyCode_New(3, 0, 6, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__77, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_dictValueExpr, 220, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__78)) __PYX_ERR(0, 220, __pyx_L1_error) + __pyx_codeobj__78 = (PyObject*)__Pyx_PyCode_New(3, 0, 6, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__77, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_dictValueExpr, 219, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__78)) __PYX_ERR(0, 219, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":237 + /* "kivyblocks/blocks.pyx":236 * d[k] = v * return d * def valueExpr(self,obj,localnamespace:dict={}): # <<<<<<<<<<<<<< * if type(obj) == type(''): * return self.strValueExpr(obj,localnamespace) */ - __pyx_tuple__79 = PyTuple_Pack(3, __pyx_n_s_self, __pyx_n_s_obj, __pyx_n_s_localnamespace); if (unlikely(!__pyx_tuple__79)) __PYX_ERR(0, 237, __pyx_L1_error) + __pyx_tuple__79 = PyTuple_Pack(3, __pyx_n_s_self, __pyx_n_s_obj, __pyx_n_s_localnamespace); if (unlikely(!__pyx_tuple__79)) __PYX_ERR(0, 236, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__79); __Pyx_GIVEREF(__pyx_tuple__79); - __pyx_codeobj__80 = (PyObject*)__Pyx_PyCode_New(3, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__79, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_valueExpr, 237, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__80)) __PYX_ERR(0, 237, __pyx_L1_error) + __pyx_codeobj__80 = (PyObject*)__Pyx_PyCode_New(3, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__79, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_valueExpr, 236, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__80)) __PYX_ERR(0, 236, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":248 + /* "kivyblocks/blocks.pyx":247 * return obj * * def w_build(self,desc) -> Widget: # <<<<<<<<<<<<<< * # print('w_build(),desc=',desc) * widgetClass = desc.get('widgettype',None) */ - __pyx_tuple__81 = PyTuple_Pack(9, __pyx_n_s_self, __pyx_n_s_desc, __pyx_n_s_widgetClass, __pyx_n_s_opts, __pyx_n_s_widget, __pyx_n_s_klass, __pyx_n_s_e, __pyx_n_s_id, __pyx_n_s_app_2); if (unlikely(!__pyx_tuple__81)) __PYX_ERR(0, 248, __pyx_L1_error) + __pyx_tuple__81 = PyTuple_Pack(9, __pyx_n_s_self, __pyx_n_s_desc, __pyx_n_s_widgetClass, __pyx_n_s_opts, __pyx_n_s_widget, __pyx_n_s_klass, __pyx_n_s_e, __pyx_n_s_id, __pyx_n_s_app_2); if (unlikely(!__pyx_tuple__81)) __PYX_ERR(0, 247, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__81); __Pyx_GIVEREF(__pyx_tuple__81); - __pyx_codeobj__82 = (PyObject*)__Pyx_PyCode_New(2, 0, 9, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__81, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_w_build, 248, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__82)) __PYX_ERR(0, 248, __pyx_L1_error) + __pyx_codeobj__82 = (PyObject*)__Pyx_PyCode_New(2, 0, 9, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__81, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_w_build, 247, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__82)) __PYX_ERR(0, 247, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":287 + /* "kivyblocks/blocks.pyx":286 * return widget * * def build_attributes(self, widget:Widget,desc,t=None): # <<<<<<<<<<<<<< * excludes = ['widgettype','options','subwidgets','binds'] * for k,v in [(k,v) for k,v in desc.items() if k not in excludes]: */ - __pyx_tuple__83 = PyTuple_Pack(10, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_t, __pyx_n_s_excludes, __pyx_n_s_k, __pyx_n_s_v, __pyx_n_s_b, __pyx_n_s_w, __pyx_n_s_aw); if (unlikely(!__pyx_tuple__83)) __PYX_ERR(0, 287, __pyx_L1_error) + __pyx_tuple__83 = PyTuple_Pack(10, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_t, __pyx_n_s_excludes, __pyx_n_s_k, __pyx_n_s_v, __pyx_n_s_b, __pyx_n_s_w, __pyx_n_s_aw); if (unlikely(!__pyx_tuple__83)) __PYX_ERR(0, 286, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__83); __Pyx_GIVEREF(__pyx_tuple__83); - __pyx_codeobj__84 = (PyObject*)__Pyx_PyCode_New(4, 0, 10, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__83, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_build_attributes, 287, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__84)) __PYX_ERR(0, 287, __pyx_L1_error) - __pyx_tuple__85 = PyTuple_Pack(1, ((PyObject *)Py_None)); if (unlikely(!__pyx_tuple__85)) __PYX_ERR(0, 287, __pyx_L1_error) + __pyx_codeobj__84 = (PyObject*)__Pyx_PyCode_New(4, 0, 10, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__83, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_build_attributes, 286, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__84)) __PYX_ERR(0, 286, __pyx_L1_error) + __pyx_tuple__85 = PyTuple_Pack(1, ((PyObject *)Py_None)); if (unlikely(!__pyx_tuple__85)) __PYX_ERR(0, 286, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__85); __Pyx_GIVEREF(__pyx_tuple__85); - /* "kivyblocks/blocks.pyx":304 + /* "kivyblocks/blocks.pyx":303 * localnamespace={'self':widget})) * * def build_rest(self, widget:Widget,desc,t=None): # <<<<<<<<<<<<<< * self.subwidget_total = len(desc.get('subwidgets',[])) * self.subwidgets = [ None for i in range(self.subwidget_total)] */ - __pyx_tuple__86 = PyTuple_Pack(10, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_t, __pyx_n_s_pos, __pyx_n_s_sw, __pyx_n_s_b, __pyx_n_s_kw, __pyx_n_s_w, __pyx_n_s_i); if (unlikely(!__pyx_tuple__86)) __PYX_ERR(0, 304, __pyx_L1_error) + __pyx_tuple__86 = PyTuple_Pack(10, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_t, __pyx_n_s_pos, __pyx_n_s_sw, __pyx_n_s_b, __pyx_n_s_kw, __pyx_n_s_w, __pyx_n_s_i); if (unlikely(!__pyx_tuple__86)) __PYX_ERR(0, 303, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__86); __Pyx_GIVEREF(__pyx_tuple__86); - __pyx_codeobj__87 = (PyObject*)__Pyx_PyCode_New(4, 0, 10, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__86, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_build_rest, 304, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__87)) __PYX_ERR(0, 304, __pyx_L1_error) - __pyx_tuple__88 = PyTuple_Pack(1, ((PyObject *)Py_None)); if (unlikely(!__pyx_tuple__88)) __PYX_ERR(0, 304, __pyx_L1_error) + __pyx_codeobj__87 = (PyObject*)__Pyx_PyCode_New(4, 0, 10, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__86, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_build_rest, 303, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__87)) __PYX_ERR(0, 303, __pyx_L1_error) + __pyx_tuple__88 = PyTuple_Pack(1, ((PyObject *)Py_None)); if (unlikely(!__pyx_tuple__88)) __PYX_ERR(0, 303, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__88); __Pyx_GIVEREF(__pyx_tuple__88); - /* "kivyblocks/blocks.pyx":320 + /* "kivyblocks/blocks.pyx":319 * self.buildBind(widget,kw) * * def buildBind(self, widget:Widget, desc): # <<<<<<<<<<<<<< * wid = desc.get('wid','self') * w = Blocks.getWidgetById(desc.get('wid','self'),from_widget=widget) */ - __pyx_tuple__89 = PyTuple_Pack(7, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_wid, __pyx_n_s_w, __pyx_n_s_event, __pyx_n_s_f); if (unlikely(!__pyx_tuple__89)) __PYX_ERR(0, 320, __pyx_L1_error) + __pyx_tuple__89 = PyTuple_Pack(7, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_wid, __pyx_n_s_w, __pyx_n_s_event, __pyx_n_s_f); if (unlikely(!__pyx_tuple__89)) __PYX_ERR(0, 319, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__89); __Pyx_GIVEREF(__pyx_tuple__89); - __pyx_codeobj__90 = (PyObject*)__Pyx_PyCode_New(3, 0, 7, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__89, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_buildBind, 320, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__90)) __PYX_ERR(0, 320, __pyx_L1_error) + __pyx_codeobj__90 = (PyObject*)__Pyx_PyCode_New(3, 0, 7, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__89, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_buildBind, 319, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__90)) __PYX_ERR(0, 319, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":338 + /* "kivyblocks/blocks.pyx":337 * # Logger.info('Block: %s bind built', str(desc)) * * def multipleAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< * desc1 = {k:v for k, v in desc.items() if k != 'actions'} * mydesc = desc1.copy() */ - __pyx_tuple__91 = PyTuple_Pack(10, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_args, __pyx_n_s_desc1, __pyx_n_s_mydesc, __pyx_n_s_a, __pyx_n_s_new_desc, __pyx_n_s_k, __pyx_n_s_v); if (unlikely(!__pyx_tuple__91)) __PYX_ERR(0, 338, __pyx_L1_error) + __pyx_tuple__91 = PyTuple_Pack(10, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_args, __pyx_n_s_desc1, __pyx_n_s_mydesc, __pyx_n_s_a, __pyx_n_s_new_desc, __pyx_n_s_k, __pyx_n_s_v); if (unlikely(!__pyx_tuple__91)) __PYX_ERR(0, 337, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__91); __Pyx_GIVEREF(__pyx_tuple__91); - __pyx_codeobj__92 = (PyObject*)__Pyx_PyCode_New(3, 0, 10, 0, CO_OPTIMIZED|CO_NEWLOCALS|CO_VARARGS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__91, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_multipleAction, 338, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__92)) __PYX_ERR(0, 338, __pyx_L1_error) + __pyx_codeobj__92 = (PyObject*)__Pyx_PyCode_New(3, 0, 10, 0, CO_OPTIMIZED|CO_NEWLOCALS|CO_VARARGS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__91, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_multipleAction, 337, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__92)) __PYX_ERR(0, 337, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":346 + /* "kivyblocks/blocks.pyx":345 * self.uniaction(widget,new_desc, *args) * * def conform_action(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< * conform_desc = desc.get('conform') * blocks = Blocks() */ - __pyx_tuple__93 = PyTuple_Pack(7, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_args, __pyx_n_s_conform_desc, __pyx_n_s_blocks, __pyx_n_s_w); if (unlikely(!__pyx_tuple__93)) __PYX_ERR(0, 346, __pyx_L1_error) + __pyx_tuple__93 = PyTuple_Pack(7, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_args, __pyx_n_s_conform_desc, __pyx_n_s_blocks, __pyx_n_s_w); if (unlikely(!__pyx_tuple__93)) __PYX_ERR(0, 345, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__93); __Pyx_GIVEREF(__pyx_tuple__93); - __pyx_codeobj__94 = (PyObject*)__Pyx_PyCode_New(3, 0, 7, 0, CO_OPTIMIZED|CO_NEWLOCALS|CO_VARARGS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__93, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_conform_action, 346, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__94)) __PYX_ERR(0, 346, __pyx_L1_error) + __pyx_codeobj__94 = (PyObject*)__Pyx_PyCode_New(3, 0, 7, 0, CO_OPTIMIZED|CO_NEWLOCALS|CO_VARARGS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__93, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_conform_action, 345, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__94)) __PYX_ERR(0, 345, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":359 + /* "kivyblocks/blocks.pyx":358 * w.open() * * def uniaction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< * Logger.info('Block: uniaction() called, desc=%s, args=%s', \ * str(desc), */ - __pyx_tuple__95 = PyTuple_Pack(5, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_args, __pyx_n_s_acttype); if (unlikely(!__pyx_tuple__95)) __PYX_ERR(0, 359, __pyx_L1_error) + __pyx_tuple__95 = PyTuple_Pack(5, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_args, __pyx_n_s_acttype); if (unlikely(!__pyx_tuple__95)) __PYX_ERR(0, 358, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__95); __Pyx_GIVEREF(__pyx_tuple__95); - __pyx_codeobj__96 = (PyObject*)__Pyx_PyCode_New(3, 0, 5, 0, CO_OPTIMIZED|CO_NEWLOCALS|CO_VARARGS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__95, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_uniaction, 359, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__96)) __PYX_ERR(0, 359, __pyx_L1_error) + __pyx_codeobj__96 = (PyObject*)__Pyx_PyCode_New(3, 0, 5, 0, CO_OPTIMIZED|CO_NEWLOCALS|CO_VARARGS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__95, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_uniaction, 358, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__96)) __PYX_ERR(0, 358, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":383 + /* "kivyblocks/blocks.pyx":382 * alert("actiontype(%s) invalid" % acttype,title='error') * * def eventAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< * target = self.get_target(widget, desc) * event = desc.get('dispatch_event') */ - __pyx_tuple__97 = PyTuple_Pack(9, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_args, __pyx_n_s_target, __pyx_n_s_event, __pyx_n_s_params, __pyx_n_s_d, __pyx_n_s_e); if (unlikely(!__pyx_tuple__97)) __PYX_ERR(0, 383, __pyx_L1_error) + __pyx_tuple__97 = PyTuple_Pack(9, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_args, __pyx_n_s_target, __pyx_n_s_event, __pyx_n_s_params, __pyx_n_s_d, __pyx_n_s_e); if (unlikely(!__pyx_tuple__97)) __PYX_ERR(0, 382, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__97); __Pyx_GIVEREF(__pyx_tuple__97); - __pyx_codeobj__98 = (PyObject*)__Pyx_PyCode_New(3, 0, 9, 0, CO_OPTIMIZED|CO_NEWLOCALS|CO_VARARGS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__97, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_eventAction, 383, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__98)) __PYX_ERR(0, 383, __pyx_L1_error) + __pyx_codeobj__98 = (PyObject*)__Pyx_PyCode_New(3, 0, 9, 0, CO_OPTIMIZED|CO_NEWLOCALS|CO_VARARGS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__97, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_eventAction, 382, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__98)) __PYX_ERR(0, 382, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":401 + /* "kivyblocks/blocks.pyx":400 * return * * def get_target(self, widget:Widget, desc): # <<<<<<<<<<<<<< * if not desc.get('target'): * return None */ - __pyx_tuple__99 = PyTuple_Pack(3, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc); if (unlikely(!__pyx_tuple__99)) __PYX_ERR(0, 401, __pyx_L1_error) + __pyx_tuple__99 = PyTuple_Pack(3, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc); if (unlikely(!__pyx_tuple__99)) __PYX_ERR(0, 400, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__99); __Pyx_GIVEREF(__pyx_tuple__99); - __pyx_codeobj__100 = (PyObject*)__Pyx_PyCode_New(3, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__99, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_get_target, 401, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__100)) __PYX_ERR(0, 401, __pyx_L1_error) + __pyx_codeobj__100 = (PyObject*)__Pyx_PyCode_New(3, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__99, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_get_target, 400, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__100)) __PYX_ERR(0, 400, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":406 + /* "kivyblocks/blocks.pyx":405 * return Blocks.getWidgetById(desc.get('target'),from_widget=widget) * * def blocksAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< * target = self.get_target(widget, desc) * add_mode = desc.get('mode','replace') */ - __pyx_tuple__101 = PyTuple_Pack(14, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_args, __pyx_n_s_target, __pyx_n_s_add_mode, __pyx_n_s_opts, __pyx_n_s_d, __pyx_n_s_p, __pyx_n_s_doit, __pyx_n_s_doit, __pyx_n_s_doerr, __pyx_n_s_doerr, __pyx_n_s_b); if (unlikely(!__pyx_tuple__101)) __PYX_ERR(0, 406, __pyx_L1_error) + __pyx_tuple__101 = PyTuple_Pack(14, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_args, __pyx_n_s_target, __pyx_n_s_add_mode, __pyx_n_s_opts, __pyx_n_s_d, __pyx_n_s_p, __pyx_n_s_doit, __pyx_n_s_doit, __pyx_n_s_doerr, __pyx_n_s_doerr, __pyx_n_s_b); if (unlikely(!__pyx_tuple__101)) __PYX_ERR(0, 405, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__101); __Pyx_GIVEREF(__pyx_tuple__101); - __pyx_codeobj__102 = (PyObject*)__Pyx_PyCode_New(3, 0, 14, 0, CO_OPTIMIZED|CO_NEWLOCALS|CO_VARARGS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__101, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_blocksAction, 406, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__102)) __PYX_ERR(0, 406, __pyx_L1_error) + __pyx_codeobj__102 = (PyObject*)__Pyx_PyCode_New(3, 0, 14, 0, CO_OPTIMIZED|CO_NEWLOCALS|CO_VARARGS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__101, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_blocksAction, 405, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__102)) __PYX_ERR(0, 405, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":431 + /* "kivyblocks/blocks.pyx":433 * b.widgetBuild(opts) * * def urlwidgetAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< - * target = self.get_target(widget, desc) - * add_mode = desc.get('mode','replace') + * Logger.info('Block: urlwidgetAction() called, desc=%s, args=%s', \ + * str(desc), */ - __pyx_tuple__103 = PyTuple_Pack(14, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_args, __pyx_n_s_target, __pyx_n_s_add_mode, __pyx_n_s_opts, __pyx_n_s_p, __pyx_n_s_d, __pyx_n_s_doit, __pyx_n_s_doit, __pyx_n_s_doerr, __pyx_n_s_doerr, __pyx_n_s_b); if (unlikely(!__pyx_tuple__103)) __PYX_ERR(0, 431, __pyx_L1_error) + __pyx_tuple__103 = PyTuple_Pack(14, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_args, __pyx_n_s_target, __pyx_n_s_add_mode, __pyx_n_s_opts, __pyx_n_s_p, __pyx_n_s_d, __pyx_n_s_doit, __pyx_n_s_doit, __pyx_n_s_doerr, __pyx_n_s_doerr, __pyx_n_s_b); if (unlikely(!__pyx_tuple__103)) __PYX_ERR(0, 433, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__103); __Pyx_GIVEREF(__pyx_tuple__103); - __pyx_codeobj__104 = (PyObject*)__Pyx_PyCode_New(3, 0, 14, 0, CO_OPTIMIZED|CO_NEWLOCALS|CO_VARARGS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__103, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_urlwidgetAction, 431, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__104)) __PYX_ERR(0, 431, __pyx_L1_error) - - /* "kivyblocks/blocks.pyx":462 - * b.widgetBuild(d) - * - * def getActionData(self, widget:Widget, desc,*args): # <<<<<<<<<<<<<< - * data = {} - * rtdesc = self.build_rtdesc(desc) - */ - __pyx_tuple__105 = PyTuple_Pack(7, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_args, __pyx_n_s_data, __pyx_n_s_rtdesc, __pyx_n_s_rt); if (unlikely(!__pyx_tuple__105)) __PYX_ERR(0, 462, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__105); - __Pyx_GIVEREF(__pyx_tuple__105); - __pyx_codeobj__106 = (PyObject*)__Pyx_PyCode_New(3, 0, 7, 0, CO_OPTIMIZED|CO_NEWLOCALS|CO_VARARGS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__105, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_getActionData, 462, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__106)) __PYX_ERR(0, 462, __pyx_L1_error) + __pyx_codeobj__104 = (PyObject*)__Pyx_PyCode_New(3, 0, 14, 0, CO_OPTIMIZED|CO_NEWLOCALS|CO_VARARGS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__103, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_urlwidgetAction, 433, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__104)) __PYX_ERR(0, 433, __pyx_L1_error) /* "kivyblocks/blocks.pyx":471 + * b.widgetBuild(d) + * + * def getActionData(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< + * Logger.info('Block: getActionData(): desc=%s args=%s' + * ,str(desc), args) + */ + __pyx_tuple__105 = PyTuple_Pack(7, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_args, __pyx_n_s_data, __pyx_n_s_rtdesc, __pyx_n_s_rt); if (unlikely(!__pyx_tuple__105)) __PYX_ERR(0, 471, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__105); + __Pyx_GIVEREF(__pyx_tuple__105); + __pyx_codeobj__106 = (PyObject*)__Pyx_PyCode_New(3, 0, 7, 0, CO_OPTIMIZED|CO_NEWLOCALS|CO_VARARGS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__105, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_getActionData, 471, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__106)) __PYX_ERR(0, 471, __pyx_L1_error) + + /* "kivyblocks/blocks.pyx":485 * return data * * def registedfunctionAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< * target = self.get_target(widget, desc) * rf = RegisterFunction() */ - __pyx_tuple__107 = PyTuple_Pack(10, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_args, __pyx_n_s_target, __pyx_n_s_rf, __pyx_n_s_name, __pyx_n_s_func, __pyx_n_s_params, __pyx_n_s_d); if (unlikely(!__pyx_tuple__107)) __PYX_ERR(0, 471, __pyx_L1_error) + __pyx_tuple__107 = PyTuple_Pack(10, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_args, __pyx_n_s_target, __pyx_n_s_rf, __pyx_n_s_name, __pyx_n_s_func, __pyx_n_s_params, __pyx_n_s_d); if (unlikely(!__pyx_tuple__107)) __PYX_ERR(0, 485, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__107); __Pyx_GIVEREF(__pyx_tuple__107); - __pyx_codeobj__108 = (PyObject*)__Pyx_PyCode_New(3, 0, 10, 0, CO_OPTIMIZED|CO_NEWLOCALS|CO_VARARGS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__107, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_registedfunctionAction, 471, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__108)) __PYX_ERR(0, 471, __pyx_L1_error) + __pyx_codeobj__108 = (PyObject*)__Pyx_PyCode_New(3, 0, 10, 0, CO_OPTIMIZED|CO_NEWLOCALS|CO_VARARGS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__107, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_registedfunctionAction, 485, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__108)) __PYX_ERR(0, 485, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":487 + /* "kivyblocks/blocks.pyx":501 * func(target, *args, **params) * * def scriptAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< * script = desc.get('script') * if not script: */ - __pyx_tuple__109 = PyTuple_Pack(9, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_args, __pyx_n_s_script_2, __pyx_n_s_target, __pyx_n_s_d, __pyx_n_s_ns, __pyx_n_s_e); if (unlikely(!__pyx_tuple__109)) __PYX_ERR(0, 487, __pyx_L1_error) + __pyx_tuple__109 = PyTuple_Pack(9, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_args, __pyx_n_s_script_2, __pyx_n_s_target, __pyx_n_s_d, __pyx_n_s_ns, __pyx_n_s_e); if (unlikely(!__pyx_tuple__109)) __PYX_ERR(0, 501, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__109); __Pyx_GIVEREF(__pyx_tuple__109); - __pyx_codeobj__110 = (PyObject*)__Pyx_PyCode_New(3, 0, 9, 0, CO_OPTIMIZED|CO_NEWLOCALS|CO_VARARGS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__109, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_scriptAction, 487, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__110)) __PYX_ERR(0, 487, __pyx_L1_error) + __pyx_codeobj__110 = (PyObject*)__Pyx_PyCode_New(3, 0, 9, 0, CO_OPTIMIZED|CO_NEWLOCALS|CO_VARARGS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__109, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_scriptAction, 501, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__110)) __PYX_ERR(0, 501, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":508 + /* "kivyblocks/blocks.pyx":522 * print(e) * * def build_rtdesc(self, desc): # <<<<<<<<<<<<<< * rtdesc = desc.get('rtdata') * if not rtdesc: */ - __pyx_tuple__111 = PyTuple_Pack(3, __pyx_n_s_self, __pyx_n_s_desc, __pyx_n_s_rtdesc); if (unlikely(!__pyx_tuple__111)) __PYX_ERR(0, 508, __pyx_L1_error) + __pyx_tuple__111 = PyTuple_Pack(3, __pyx_n_s_self, __pyx_n_s_desc, __pyx_n_s_rtdesc); if (unlikely(!__pyx_tuple__111)) __PYX_ERR(0, 522, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__111); __Pyx_GIVEREF(__pyx_tuple__111); - __pyx_codeobj__112 = (PyObject*)__Pyx_PyCode_New(2, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__111, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_build_rtdesc, 508, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__112)) __PYX_ERR(0, 508, __pyx_L1_error) + __pyx_codeobj__112 = (PyObject*)__Pyx_PyCode_New(2, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__111, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_build_rtdesc, 522, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__112)) __PYX_ERR(0, 522, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":523 + /* "kivyblocks/blocks.pyx":535 * return rtdesc * * def get_rtdata(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< * """ * desc descript follow attributes */ - __pyx_tuple__113 = PyTuple_Pack(13, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_args, __pyx_n_s_kwargs, __pyx_n_s_w, __pyx_n_s_target, __pyx_n_s_script_2, __pyx_n_s_ns, __pyx_n_s_d, __pyx_n_s_method, __pyx_n_s_f, __pyx_n_s_r); if (unlikely(!__pyx_tuple__113)) __PYX_ERR(0, 523, __pyx_L1_error) + __pyx_tuple__113 = PyTuple_Pack(13, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_args, __pyx_n_s_kwargs, __pyx_n_s_w, __pyx_n_s_target, __pyx_n_s_script_2, __pyx_n_s_ns, __pyx_n_s_d, __pyx_n_s_method, __pyx_n_s_f, __pyx_n_s_r); if (unlikely(!__pyx_tuple__113)) __PYX_ERR(0, 535, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__113); __Pyx_GIVEREF(__pyx_tuple__113); - __pyx_codeobj__114 = (PyObject*)__Pyx_PyCode_New(3, 0, 13, 0, CO_OPTIMIZED|CO_NEWLOCALS|CO_VARARGS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__113, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_get_rtdata, 523, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__114)) __PYX_ERR(0, 523, __pyx_L1_error) + __pyx_codeobj__114 = (PyObject*)__Pyx_PyCode_New(3, 0, 13, 0, CO_OPTIMIZED|CO_NEWLOCALS|CO_VARARGS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__113, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_get_rtdata, 535, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__114)) __PYX_ERR(0, 535, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":576 + /* "kivyblocks/blocks.pyx":588 * return {} * * def methodAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< * method = desc.get('method') * target = self.get_target(widget, desc) */ - __pyx_tuple__115 = PyTuple_Pack(9, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_args, __pyx_n_s_method, __pyx_n_s_target, __pyx_n_s_f, __pyx_n_s_kwargs, __pyx_n_s_d); if (unlikely(!__pyx_tuple__115)) __PYX_ERR(0, 576, __pyx_L1_error) + __pyx_tuple__115 = PyTuple_Pack(9, __pyx_n_s_self, __pyx_n_s_widget, __pyx_n_s_desc, __pyx_n_s_args, __pyx_n_s_method, __pyx_n_s_target, __pyx_n_s_f, __pyx_n_s_kwargs, __pyx_n_s_d); if (unlikely(!__pyx_tuple__115)) __PYX_ERR(0, 588, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__115); __Pyx_GIVEREF(__pyx_tuple__115); - __pyx_codeobj__116 = (PyObject*)__Pyx_PyCode_New(3, 0, 9, 0, CO_OPTIMIZED|CO_NEWLOCALS|CO_VARARGS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__115, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_methodAction, 576, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__116)) __PYX_ERR(0, 576, __pyx_L1_error) + __pyx_codeobj__116 = (PyObject*)__Pyx_PyCode_New(3, 0, 9, 0, CO_OPTIMIZED|CO_NEWLOCALS|CO_VARARGS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__115, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_methodAction, 588, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__116)) __PYX_ERR(0, 588, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":597 + /* "kivyblocks/blocks.pyx":609 * alert('%s method not found' % method) * * def widgetBuild(self, desc): # <<<<<<<<<<<<<< * """ * desc format: */ - __pyx_tuple__117 = PyTuple_Pack(12, __pyx_n_s_self, __pyx_n_s_desc, __pyx_n_s_doit, __pyx_n_s_doit, __pyx_n_s_widgettype, __pyx_n_s_opts, __pyx_n_s_extend, __pyx_n_s_addon, __pyx_n_s_url, __pyx_n_s_rtdesc, __pyx_n_s_rtdata, __pyx_n_s_params); if (unlikely(!__pyx_tuple__117)) __PYX_ERR(0, 597, __pyx_L1_error) + __pyx_tuple__117 = PyTuple_Pack(12, __pyx_n_s_self, __pyx_n_s_desc, __pyx_n_s_doit, __pyx_n_s_doit, __pyx_n_s_widgettype, __pyx_n_s_opts, __pyx_n_s_extend, __pyx_n_s_addon, __pyx_n_s_url, __pyx_n_s_rtdesc, __pyx_n_s_rtdata, __pyx_n_s_params); if (unlikely(!__pyx_tuple__117)) __PYX_ERR(0, 609, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__117); __Pyx_GIVEREF(__pyx_tuple__117); - __pyx_codeobj__118 = (PyObject*)__Pyx_PyCode_New(2, 0, 12, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__117, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_widgetBuild, 597, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__118)) __PYX_ERR(0, 597, __pyx_L1_error) + __pyx_codeobj__118 = (PyObject*)__Pyx_PyCode_New(2, 0, 12, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__117, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_widgetBuild, 609, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__118)) __PYX_ERR(0, 609, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":676 + /* "kivyblocks/blocks.pyx":688 * * @classmethod * def getWidgetById(self, id:str, from_widget:Widget=None) -> Widget: # <<<<<<<<<<<<<< * def find_widget_by_id(id, from_widget): * if id=='self': */ - __pyx_tuple__119 = PyTuple_Pack(9, __pyx_n_s_self, __pyx_n_s_id, __pyx_n_s_from_widget, __pyx_n_s_find_widget_by_id, __pyx_n_s_find_widget_by_id, __pyx_n_s_ids, __pyx_n_s_app_2, __pyx_n_s_fid, __pyx_n_s_w); if (unlikely(!__pyx_tuple__119)) __PYX_ERR(0, 676, __pyx_L1_error) + __pyx_tuple__119 = PyTuple_Pack(9, __pyx_n_s_self, __pyx_n_s_id, __pyx_n_s_from_widget, __pyx_n_s_find_widget_by_id, __pyx_n_s_find_widget_by_id, __pyx_n_s_ids, __pyx_n_s_app_2, __pyx_n_s_fid, __pyx_n_s_w); if (unlikely(!__pyx_tuple__119)) __PYX_ERR(0, 688, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__119); __Pyx_GIVEREF(__pyx_tuple__119); - __pyx_codeobj__120 = (PyObject*)__Pyx_PyCode_New(3, 0, 9, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__119, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_getWidgetById, 676, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__120)) __PYX_ERR(0, 676, __pyx_L1_error) - __pyx_tuple__121 = PyTuple_Pack(1, ((PyObject *)Py_None)); if (unlikely(!__pyx_tuple__121)) __PYX_ERR(0, 676, __pyx_L1_error) + __pyx_codeobj__120 = (PyObject*)__Pyx_PyCode_New(3, 0, 9, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__119, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_getWidgetById, 688, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__120)) __PYX_ERR(0, 688, __pyx_L1_error) + __pyx_tuple__121 = PyTuple_Pack(1, ((PyObject *)Py_None)); if (unlikely(!__pyx_tuple__121)) __PYX_ERR(0, 688, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__121); __Pyx_GIVEREF(__pyx_tuple__121); - /* "kivyblocks/blocks.pyx":739 + /* "kivyblocks/blocks.pyx":752 * return w * * def on_built(self,v=None): # <<<<<<<<<<<<<< * return * */ - __pyx_tuple__122 = PyTuple_Pack(2, __pyx_n_s_self, __pyx_n_s_v); if (unlikely(!__pyx_tuple__122)) __PYX_ERR(0, 739, __pyx_L1_error) + __pyx_tuple__122 = PyTuple_Pack(2, __pyx_n_s_self, __pyx_n_s_v); if (unlikely(!__pyx_tuple__122)) __PYX_ERR(0, 752, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__122); __Pyx_GIVEREF(__pyx_tuple__122); - __pyx_codeobj__123 = (PyObject*)__Pyx_PyCode_New(2, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__122, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_on_built, 739, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__123)) __PYX_ERR(0, 739, __pyx_L1_error) - __pyx_tuple__124 = PyTuple_Pack(1, ((PyObject *)Py_None)); if (unlikely(!__pyx_tuple__124)) __PYX_ERR(0, 739, __pyx_L1_error) + __pyx_codeobj__123 = (PyObject*)__Pyx_PyCode_New(2, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__122, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_on_built, 752, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__123)) __PYX_ERR(0, 752, __pyx_L1_error) + __pyx_tuple__124 = PyTuple_Pack(1, ((PyObject *)Py_None)); if (unlikely(!__pyx_tuple__124)) __PYX_ERR(0, 752, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__124); __Pyx_GIVEREF(__pyx_tuple__124); - /* "kivyblocks/blocks.pyx":742 + /* "kivyblocks/blocks.pyx":755 * return * * def on_failed(self,e=None): # <<<<<<<<<<<<<< * return * */ - __pyx_tuple__125 = PyTuple_Pack(2, __pyx_n_s_self, __pyx_n_s_e); if (unlikely(!__pyx_tuple__125)) __PYX_ERR(0, 742, __pyx_L1_error) + __pyx_tuple__125 = PyTuple_Pack(2, __pyx_n_s_self, __pyx_n_s_e); if (unlikely(!__pyx_tuple__125)) __PYX_ERR(0, 755, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__125); __Pyx_GIVEREF(__pyx_tuple__125); - __pyx_codeobj__126 = (PyObject*)__Pyx_PyCode_New(2, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__125, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_on_failed, 742, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__126)) __PYX_ERR(0, 742, __pyx_L1_error) - __pyx_tuple__127 = PyTuple_Pack(1, ((PyObject *)Py_None)); if (unlikely(!__pyx_tuple__127)) __PYX_ERR(0, 742, __pyx_L1_error) + __pyx_codeobj__126 = (PyObject*)__Pyx_PyCode_New(2, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__125, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_blocks_pyx, __pyx_n_s_on_failed, 755, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__126)) __PYX_ERR(0, 755, __pyx_L1_error) + __pyx_tuple__127 = PyTuple_Pack(1, ((PyObject *)Py_None)); if (unlikely(!__pyx_tuple__127)) __PYX_ERR(0, 755, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__127); __Pyx_GIVEREF(__pyx_tuple__127); __Pyx_RefNannyFinishContext(); @@ -25375,7 +25628,7 @@ static int __Pyx_modinit_type_init_code(void) { int __pyx_clineno = 0; __Pyx_RefNannySetupContext("__Pyx_modinit_type_init_code", 0); /*--- Type init code ---*/ - if (PyType_Ready(&__pyx_type_10kivyblocks_6blocks___pyx_scope_struct__blocksAction) < 0) __PYX_ERR(0, 406, __pyx_L1_error) + if (PyType_Ready(&__pyx_type_10kivyblocks_6blocks___pyx_scope_struct__blocksAction) < 0) __PYX_ERR(0, 405, __pyx_L1_error) #if PY_VERSION_HEX < 0x030800B1 __pyx_type_10kivyblocks_6blocks___pyx_scope_struct__blocksAction.tp_print = 0; #endif @@ -25383,7 +25636,7 @@ static int __Pyx_modinit_type_init_code(void) { __pyx_type_10kivyblocks_6blocks___pyx_scope_struct__blocksAction.tp_getattro = __Pyx_PyObject_GenericGetAttrNoDict; } __pyx_ptype_10kivyblocks_6blocks___pyx_scope_struct__blocksAction = &__pyx_type_10kivyblocks_6blocks___pyx_scope_struct__blocksAction; - if (PyType_Ready(&__pyx_type_10kivyblocks_6blocks___pyx_scope_struct_1_urlwidgetAction) < 0) __PYX_ERR(0, 431, __pyx_L1_error) + if (PyType_Ready(&__pyx_type_10kivyblocks_6blocks___pyx_scope_struct_1_urlwidgetAction) < 0) __PYX_ERR(0, 433, __pyx_L1_error) #if PY_VERSION_HEX < 0x030800B1 __pyx_type_10kivyblocks_6blocks___pyx_scope_struct_1_urlwidgetAction.tp_print = 0; #endif @@ -25391,7 +25644,7 @@ static int __Pyx_modinit_type_init_code(void) { __pyx_type_10kivyblocks_6blocks___pyx_scope_struct_1_urlwidgetAction.tp_getattro = __Pyx_PyObject_GenericGetAttrNoDict; } __pyx_ptype_10kivyblocks_6blocks___pyx_scope_struct_1_urlwidgetAction = &__pyx_type_10kivyblocks_6blocks___pyx_scope_struct_1_urlwidgetAction; - if (PyType_Ready(&__pyx_type_10kivyblocks_6blocks___pyx_scope_struct_2_widgetBuild) < 0) __PYX_ERR(0, 597, __pyx_L1_error) + if (PyType_Ready(&__pyx_type_10kivyblocks_6blocks___pyx_scope_struct_2_widgetBuild) < 0) __PYX_ERR(0, 609, __pyx_L1_error) #if PY_VERSION_HEX < 0x030800B1 __pyx_type_10kivyblocks_6blocks___pyx_scope_struct_2_widgetBuild.tp_print = 0; #endif @@ -25399,7 +25652,7 @@ static int __Pyx_modinit_type_init_code(void) { __pyx_type_10kivyblocks_6blocks___pyx_scope_struct_2_widgetBuild.tp_getattro = __Pyx_PyObject_GenericGetAttrNoDict; } __pyx_ptype_10kivyblocks_6blocks___pyx_scope_struct_2_widgetBuild = &__pyx_type_10kivyblocks_6blocks___pyx_scope_struct_2_widgetBuild; - if (PyType_Ready(&__pyx_type_10kivyblocks_6blocks___pyx_scope_struct_3_getWidgetById) < 0) __PYX_ERR(0, 676, __pyx_L1_error) + if (PyType_Ready(&__pyx_type_10kivyblocks_6blocks___pyx_scope_struct_3_getWidgetById) < 0) __PYX_ERR(0, 688, __pyx_L1_error) #if PY_VERSION_HEX < 0x030800B1 __pyx_type_10kivyblocks_6blocks___pyx_scope_struct_3_getWidgetById.tp_print = 0; #endif @@ -25695,7 +25948,7 @@ if (!__Pyx_RefNanny) { * import ujson as json * from traceback import print_exc # <<<<<<<<<<<<<< * - * import kivy + * from functools import partial */ __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 5, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); @@ -25714,107 +25967,95 @@ if (!__Pyx_RefNanny) { /* "kivyblocks/blocks.pyx":7 * from traceback import print_exc * - * import kivy # <<<<<<<<<<<<<< - * from functools import partial - * - */ - __pyx_t_2 = __Pyx_Import(__pyx_n_s_kivy, 0, -1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 7, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_kivy, __pyx_t_2) < 0) __PYX_ERR(0, 7, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - - /* "kivyblocks/blocks.pyx":8 - * - * import kivy * from functools import partial # <<<<<<<<<<<<<< * * from appPublic.dictExt import dictExtend */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 8, __pyx_L1_error) + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 7, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_n_s_partial); __Pyx_GIVEREF(__pyx_n_s_partial); PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s_partial); - __pyx_t_1 = __Pyx_Import(__pyx_n_s_functools, __pyx_t_2, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 8, __pyx_L1_error) + __pyx_t_1 = __Pyx_Import(__pyx_n_s_functools, __pyx_t_2, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 7, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_partial); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 8, __pyx_L1_error) + __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_partial); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 7, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_partial, __pyx_t_2) < 0) __PYX_ERR(0, 8, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_partial, __pyx_t_2) < 0) __PYX_ERR(0, 7, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":10 + /* "kivyblocks/blocks.pyx":9 * from functools import partial * * from appPublic.dictExt import dictExtend # <<<<<<<<<<<<<< * from appPublic.folderUtils import ProgramPath * from appPublic.dictObject import DictObject */ - __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 10, __pyx_L1_error) + __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 9, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_n_s_dictExtend); __Pyx_GIVEREF(__pyx_n_s_dictExtend); PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s_dictExtend); - __pyx_t_2 = __Pyx_Import(__pyx_n_s_appPublic_dictExt, __pyx_t_1, -1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 10, __pyx_L1_error) + __pyx_t_2 = __Pyx_Import(__pyx_n_s_appPublic_dictExt, __pyx_t_1, -1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 9, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_dictExtend); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 10, __pyx_L1_error) + __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_dictExtend); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 9, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_dictExtend, __pyx_t_1) < 0) __PYX_ERR(0, 10, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_dictExtend, __pyx_t_1) < 0) __PYX_ERR(0, 9, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":11 + /* "kivyblocks/blocks.pyx":10 * * from appPublic.dictExt import dictExtend * from appPublic.folderUtils import ProgramPath # <<<<<<<<<<<<<< * from appPublic.dictObject import DictObject * from appPublic.Singleton import SingletonDecorator, GlobalEnv */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 11, __pyx_L1_error) + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 10, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_n_s_ProgramPath); __Pyx_GIVEREF(__pyx_n_s_ProgramPath); PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s_ProgramPath); - __pyx_t_1 = __Pyx_Import(__pyx_n_s_appPublic_folderUtils, __pyx_t_2, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 11, __pyx_L1_error) + __pyx_t_1 = __Pyx_Import(__pyx_n_s_appPublic_folderUtils, __pyx_t_2, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 10, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_ProgramPath); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 11, __pyx_L1_error) + __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_ProgramPath); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 10, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_ProgramPath, __pyx_t_2) < 0) __PYX_ERR(0, 11, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_ProgramPath, __pyx_t_2) < 0) __PYX_ERR(0, 10, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":12 + /* "kivyblocks/blocks.pyx":11 * from appPublic.dictExt import dictExtend * from appPublic.folderUtils import ProgramPath * from appPublic.dictObject import DictObject # <<<<<<<<<<<<<< * from appPublic.Singleton import SingletonDecorator, GlobalEnv * from appPublic.datamapping import keyMapping */ - __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 12, __pyx_L1_error) + __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 11, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_n_s_DictObject); __Pyx_GIVEREF(__pyx_n_s_DictObject); PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s_DictObject); - __pyx_t_2 = __Pyx_Import(__pyx_n_s_appPublic_dictObject, __pyx_t_1, -1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 12, __pyx_L1_error) + __pyx_t_2 = __Pyx_Import(__pyx_n_s_appPublic_dictObject, __pyx_t_1, -1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 11, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_DictObject); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 12, __pyx_L1_error) + __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_DictObject); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 11, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_DictObject, __pyx_t_1) < 0) __PYX_ERR(0, 12, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_DictObject, __pyx_t_1) < 0) __PYX_ERR(0, 11, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":13 + /* "kivyblocks/blocks.pyx":12 * from appPublic.folderUtils import ProgramPath * from appPublic.dictObject import DictObject * from appPublic.Singleton import SingletonDecorator, GlobalEnv # <<<<<<<<<<<<<< * from appPublic.datamapping import keyMapping * from appPublic.registerfunction import RegisterFunction */ - __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 13, __pyx_L1_error) + __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 12, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_n_s_SingletonDecorator); __Pyx_GIVEREF(__pyx_n_s_SingletonDecorator); @@ -25822,111 +26063,111 @@ if (!__Pyx_RefNanny) { __Pyx_INCREF(__pyx_n_s_GlobalEnv); __Pyx_GIVEREF(__pyx_n_s_GlobalEnv); PyList_SET_ITEM(__pyx_t_2, 1, __pyx_n_s_GlobalEnv); - __pyx_t_1 = __Pyx_Import(__pyx_n_s_appPublic_Singleton, __pyx_t_2, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 13, __pyx_L1_error) + __pyx_t_1 = __Pyx_Import(__pyx_n_s_appPublic_Singleton, __pyx_t_2, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 12, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_SingletonDecorator); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 13, __pyx_L1_error) + __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_SingletonDecorator); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 12, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_SingletonDecorator, __pyx_t_2) < 0) __PYX_ERR(0, 13, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_SingletonDecorator, __pyx_t_2) < 0) __PYX_ERR(0, 12, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_GlobalEnv); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 13, __pyx_L1_error) + __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_GlobalEnv); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 12, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_GlobalEnv, __pyx_t_2) < 0) __PYX_ERR(0, 13, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_GlobalEnv, __pyx_t_2) < 0) __PYX_ERR(0, 12, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":14 + /* "kivyblocks/blocks.pyx":13 * from appPublic.dictObject import DictObject * from appPublic.Singleton import SingletonDecorator, GlobalEnv * from appPublic.datamapping import keyMapping # <<<<<<<<<<<<<< * from appPublic.registerfunction import RegisterFunction * */ - __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 14, __pyx_L1_error) + __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 13, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_n_s_keyMapping); __Pyx_GIVEREF(__pyx_n_s_keyMapping); PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s_keyMapping); - __pyx_t_2 = __Pyx_Import(__pyx_n_s_appPublic_datamapping, __pyx_t_1, -1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 14, __pyx_L1_error) + __pyx_t_2 = __Pyx_Import(__pyx_n_s_appPublic_datamapping, __pyx_t_1, -1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 13, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_keyMapping); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 14, __pyx_L1_error) + __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_keyMapping); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 13, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_keyMapping, __pyx_t_1) < 0) __PYX_ERR(0, 14, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_keyMapping, __pyx_t_1) < 0) __PYX_ERR(0, 13, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":15 + /* "kivyblocks/blocks.pyx":14 * from appPublic.Singleton import SingletonDecorator, GlobalEnv * from appPublic.datamapping import keyMapping * from appPublic.registerfunction import RegisterFunction # <<<<<<<<<<<<<< * * from kivy.logger import Logger */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 15, __pyx_L1_error) + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 14, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_n_s_RegisterFunction); __Pyx_GIVEREF(__pyx_n_s_RegisterFunction); PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s_RegisterFunction); - __pyx_t_1 = __Pyx_Import(__pyx_n_s_appPublic_registerfunction, __pyx_t_2, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 15, __pyx_L1_error) + __pyx_t_1 = __Pyx_Import(__pyx_n_s_appPublic_registerfunction, __pyx_t_2, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 14, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_RegisterFunction); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 15, __pyx_L1_error) + __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_RegisterFunction); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 14, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_RegisterFunction, __pyx_t_2) < 0) __PYX_ERR(0, 15, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_RegisterFunction, __pyx_t_2) < 0) __PYX_ERR(0, 14, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":17 + /* "kivyblocks/blocks.pyx":16 * from appPublic.registerfunction import RegisterFunction * * from kivy.logger import Logger # <<<<<<<<<<<<<< * from kivy.config import Config * from kivy.metrics import sp,dp,mm */ - __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 17, __pyx_L1_error) + __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 16, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_n_s_Logger); __Pyx_GIVEREF(__pyx_n_s_Logger); PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s_Logger); - __pyx_t_2 = __Pyx_Import(__pyx_n_s_kivy_logger, __pyx_t_1, -1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 17, __pyx_L1_error) + __pyx_t_2 = __Pyx_Import(__pyx_n_s_kivy_logger, __pyx_t_1, -1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 16, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_Logger); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 17, __pyx_L1_error) + __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_Logger); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 16, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_Logger, __pyx_t_1) < 0) __PYX_ERR(0, 17, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_Logger, __pyx_t_1) < 0) __PYX_ERR(0, 16, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":18 + /* "kivyblocks/blocks.pyx":17 * * from kivy.logger import Logger * from kivy.config import Config # <<<<<<<<<<<<<< * from kivy.metrics import sp,dp,mm * from kivy.core.window import WindowBase, Window */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 18, __pyx_L1_error) + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 17, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_n_s_Config); __Pyx_GIVEREF(__pyx_n_s_Config); PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s_Config); - __pyx_t_1 = __Pyx_Import(__pyx_n_s_kivy_config, __pyx_t_2, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 18, __pyx_L1_error) + __pyx_t_1 = __Pyx_Import(__pyx_n_s_kivy_config, __pyx_t_2, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 17, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_Config); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 18, __pyx_L1_error) + __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_Config); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 17, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_Config, __pyx_t_2) < 0) __PYX_ERR(0, 18, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_Config, __pyx_t_2) < 0) __PYX_ERR(0, 17, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":19 + /* "kivyblocks/blocks.pyx":18 * from kivy.logger import Logger * from kivy.config import Config * from kivy.metrics import sp,dp,mm # <<<<<<<<<<<<<< * from kivy.core.window import WindowBase, Window * from kivy.properties import BooleanProperty */ - __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 19, __pyx_L1_error) + __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 18, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_n_s_sp); __Pyx_GIVEREF(__pyx_n_s_sp); @@ -25937,31 +26178,31 @@ if (!__Pyx_RefNanny) { __Pyx_INCREF(__pyx_n_s_mm); __Pyx_GIVEREF(__pyx_n_s_mm); PyList_SET_ITEM(__pyx_t_1, 2, __pyx_n_s_mm); - __pyx_t_2 = __Pyx_Import(__pyx_n_s_kivy_metrics, __pyx_t_1, -1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 19, __pyx_L1_error) + __pyx_t_2 = __Pyx_Import(__pyx_n_s_kivy_metrics, __pyx_t_1, -1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 18, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_sp); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 19, __pyx_L1_error) + __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_sp); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 18, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_sp, __pyx_t_1) < 0) __PYX_ERR(0, 19, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_sp, __pyx_t_1) < 0) __PYX_ERR(0, 18, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_dp); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 19, __pyx_L1_error) + __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_dp); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 18, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_dp, __pyx_t_1) < 0) __PYX_ERR(0, 19, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_dp, __pyx_t_1) < 0) __PYX_ERR(0, 18, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_mm); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 19, __pyx_L1_error) + __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_mm); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 18, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_mm, __pyx_t_1) < 0) __PYX_ERR(0, 19, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_mm, __pyx_t_1) < 0) __PYX_ERR(0, 18, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":20 + /* "kivyblocks/blocks.pyx":19 * from kivy.config import Config * from kivy.metrics import sp,dp,mm * from kivy.core.window import WindowBase, Window # <<<<<<<<<<<<<< * from kivy.properties import BooleanProperty * from kivy.uix.widget import Widget */ - __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 20, __pyx_L1_error) + __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 19, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_n_s_WindowBase); __Pyx_GIVEREF(__pyx_n_s_WindowBase); @@ -25969,102 +26210,123 @@ if (!__Pyx_RefNanny) { __Pyx_INCREF(__pyx_n_s_Window); __Pyx_GIVEREF(__pyx_n_s_Window); PyList_SET_ITEM(__pyx_t_2, 1, __pyx_n_s_Window); - __pyx_t_1 = __Pyx_Import(__pyx_n_s_kivy_core_window, __pyx_t_2, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 20, __pyx_L1_error) + __pyx_t_1 = __Pyx_Import(__pyx_n_s_kivy_core_window, __pyx_t_2, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 19, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_WindowBase); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 20, __pyx_L1_error) + __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_WindowBase); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 19, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_WindowBase, __pyx_t_2) < 0) __PYX_ERR(0, 20, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_WindowBase, __pyx_t_2) < 0) __PYX_ERR(0, 19, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_Window); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 20, __pyx_L1_error) + __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_Window); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 19, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_Window, __pyx_t_2) < 0) __PYX_ERR(0, 20, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_Window, __pyx_t_2) < 0) __PYX_ERR(0, 19, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":21 + /* "kivyblocks/blocks.pyx":20 * from kivy.metrics import sp,dp,mm * from kivy.core.window import WindowBase, Window * from kivy.properties import BooleanProperty # <<<<<<<<<<<<<< * from kivy.uix.widget import Widget - * from kivy.app import App + * from kivy.uix.modalview import ModalView */ - __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 21, __pyx_L1_error) + __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 20, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_n_s_BooleanProperty); __Pyx_GIVEREF(__pyx_n_s_BooleanProperty); PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s_BooleanProperty); - __pyx_t_2 = __Pyx_Import(__pyx_n_s_kivy_properties, __pyx_t_1, -1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 21, __pyx_L1_error) + __pyx_t_2 = __Pyx_Import(__pyx_n_s_kivy_properties, __pyx_t_1, -1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 20, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_BooleanProperty); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 21, __pyx_L1_error) + __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_BooleanProperty); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 20, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_BooleanProperty, __pyx_t_1) < 0) __PYX_ERR(0, 21, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_BooleanProperty, __pyx_t_1) < 0) __PYX_ERR(0, 20, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":22 + /* "kivyblocks/blocks.pyx":21 * from kivy.core.window import WindowBase, Window * from kivy.properties import BooleanProperty * from kivy.uix.widget import Widget # <<<<<<<<<<<<<< + * from kivy.uix.modalview import ModalView * from kivy.app import App - * from kivy.factory import Factory */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 22, __pyx_L1_error) + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 21, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_n_s_Widget); __Pyx_GIVEREF(__pyx_n_s_Widget); PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s_Widget); - __pyx_t_1 = __Pyx_Import(__pyx_n_s_kivy_uix_widget, __pyx_t_2, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 22, __pyx_L1_error) + __pyx_t_1 = __Pyx_Import(__pyx_n_s_kivy_uix_widget, __pyx_t_2, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 21, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_Widget); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 22, __pyx_L1_error) + __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_Widget); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 21, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_Widget, __pyx_t_2) < 0) __PYX_ERR(0, 22, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_Widget, __pyx_t_2) < 0) __PYX_ERR(0, 21, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "kivyblocks/blocks.pyx":23 + /* "kivyblocks/blocks.pyx":22 * from kivy.properties import BooleanProperty * from kivy.uix.widget import Widget + * from kivy.uix.modalview import ModalView # <<<<<<<<<<<<<< + * from kivy.app import App + * from kivy.factory import Factory + */ + __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 22, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + __Pyx_INCREF(__pyx_n_s_ModalView); + __Pyx_GIVEREF(__pyx_n_s_ModalView); + PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s_ModalView); + __pyx_t_2 = __Pyx_Import(__pyx_n_s_kivy_uix_modalview, __pyx_t_1, -1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 22, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_ModalView); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 22, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_ModalView, __pyx_t_1) < 0) __PYX_ERR(0, 22, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + + /* "kivyblocks/blocks.pyx":23 + * from kivy.uix.widget import Widget + * from kivy.uix.modalview import ModalView * from kivy.app import App # <<<<<<<<<<<<<< * from kivy.factory import Factory * from kivy.uix.video import Video */ - __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 23, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 23, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_n_s_App); __Pyx_GIVEREF(__pyx_n_s_App); - PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s_App); - __pyx_t_2 = __Pyx_Import(__pyx_n_s_kivy_app, __pyx_t_1, -1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 23, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_App); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 23, __pyx_L1_error) + PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s_App); + __pyx_t_1 = __Pyx_Import(__pyx_n_s_kivy_app, __pyx_t_2, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 23, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_App, __pyx_t_1) < 0) __PYX_ERR(0, 23, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_App); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 23, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_App, __pyx_t_2) < 0) __PYX_ERR(0, 23, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; /* "kivyblocks/blocks.pyx":24 - * from kivy.uix.widget import Widget + * from kivy.uix.modalview import ModalView * from kivy.app import App * from kivy.factory import Factory # <<<<<<<<<<<<<< * from kivy.uix.video import Video * from .baseWidget import * */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 24, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); + __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 24, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_n_s_Factory); __Pyx_GIVEREF(__pyx_n_s_Factory); - PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s_Factory); - __pyx_t_1 = __Pyx_Import(__pyx_n_s_kivy_factory, __pyx_t_2, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 24, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_Factory); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 24, __pyx_L1_error) + PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s_Factory); + __pyx_t_2 = __Pyx_Import(__pyx_n_s_kivy_factory, __pyx_t_1, -1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 24, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_Factory, __pyx_t_2) < 0) __PYX_ERR(0, 24, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_Factory); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 24, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_Factory, __pyx_t_1) < 0) __PYX_ERR(0, 24, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; /* "kivyblocks/blocks.pyx":25 * from kivy.app import App @@ -26073,19 +26335,19 @@ if (!__Pyx_RefNanny) { * from .baseWidget import * * from .toolbar import * */ - __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 25, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 25, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_n_s_Video); __Pyx_GIVEREF(__pyx_n_s_Video); - PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s_Video); - __pyx_t_2 = __Pyx_Import(__pyx_n_s_kivy_uix_video, __pyx_t_1, -1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 25, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_Video); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 25, __pyx_L1_error) + PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s_Video); + __pyx_t_1 = __Pyx_Import(__pyx_n_s_kivy_uix_video, __pyx_t_2, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 25, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_Video, __pyx_t_1) < 0) __PYX_ERR(0, 25, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_Video); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 25, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_Video, __pyx_t_2) < 0) __PYX_ERR(0, 25, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; /* "kivyblocks/blocks.pyx":26 * from kivy.factory import Factory @@ -26094,16 +26356,16 @@ if (!__Pyx_RefNanny) { * from .toolbar import * * from .dg import DataGrid */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 26, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); + __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 26, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_n_s__28); __Pyx_GIVEREF(__pyx_n_s__28); - PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s__28); - __pyx_t_1 = __Pyx_Import(__pyx_n_s_baseWidget, __pyx_t_2, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 26, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - if (__pyx_import_star(__pyx_t_1) < 0) __PYX_ERR(0, 26, __pyx_L1_error); + PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s__28); + __pyx_t_2 = __Pyx_Import(__pyx_n_s_baseWidget, __pyx_t_1, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 26, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + if (__pyx_import_star(__pyx_t_2) < 0) __PYX_ERR(0, 26, __pyx_L1_error); + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; /* "kivyblocks/blocks.pyx":27 * from kivy.uix.video import Video @@ -26112,16 +26374,16 @@ if (!__Pyx_RefNanny) { * from .dg import DataGrid * from .utils import * */ - __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 27, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 27, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_n_s__28); __Pyx_GIVEREF(__pyx_n_s__28); - PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s__28); - __pyx_t_2 = __Pyx_Import(__pyx_n_s_toolbar, __pyx_t_1, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 27, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - if (__pyx_import_star(__pyx_t_2) < 0) __PYX_ERR(0, 27, __pyx_L1_error); + PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s__28); + __pyx_t_1 = __Pyx_Import(__pyx_n_s_toolbar, __pyx_t_2, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 27, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + if (__pyx_import_star(__pyx_t_1) < 0) __PYX_ERR(0, 27, __pyx_L1_error); + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; /* "kivyblocks/blocks.pyx":28 * from .baseWidget import * @@ -26130,19 +26392,19 @@ if (!__Pyx_RefNanny) { * from .utils import * * from .serverImageViewer import ServerImageViewer */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 28, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); + __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 28, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_n_s_DataGrid); __Pyx_GIVEREF(__pyx_n_s_DataGrid); - PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s_DataGrid); - __pyx_t_1 = __Pyx_Import(__pyx_n_s_dg, __pyx_t_2, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 28, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_DataGrid); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 28, __pyx_L1_error) + PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s_DataGrid); + __pyx_t_2 = __Pyx_Import(__pyx_n_s_dg, __pyx_t_1, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 28, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_DataGrid, __pyx_t_2) < 0) __PYX_ERR(0, 28, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_DataGrid); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 28, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_DataGrid, __pyx_t_1) < 0) __PYX_ERR(0, 28, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; /* "kivyblocks/blocks.pyx":29 * from .toolbar import * @@ -26151,16 +26413,16 @@ if (!__Pyx_RefNanny) { * from .serverImageViewer import ServerImageViewer * from .vplayer import VPlayer */ - __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 29, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 29, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_n_s__28); __Pyx_GIVEREF(__pyx_n_s__28); - PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s__28); - __pyx_t_2 = __Pyx_Import(__pyx_n_s_utils, __pyx_t_1, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 29, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - if (__pyx_import_star(__pyx_t_2) < 0) __PYX_ERR(0, 29, __pyx_L1_error); + PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s__28); + __pyx_t_1 = __Pyx_Import(__pyx_n_s_utils, __pyx_t_2, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 29, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + if (__pyx_import_star(__pyx_t_1) < 0) __PYX_ERR(0, 29, __pyx_L1_error); + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; /* "kivyblocks/blocks.pyx":30 * from .dg import DataGrid @@ -26169,19 +26431,19 @@ if (!__Pyx_RefNanny) { * from .vplayer import VPlayer * from .form import InputBox, Form, StrSearchForm */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 30, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); + __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 30, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_n_s_ServerImageViewer); __Pyx_GIVEREF(__pyx_n_s_ServerImageViewer); - PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s_ServerImageViewer); - __pyx_t_1 = __Pyx_Import(__pyx_n_s_serverImageViewer, __pyx_t_2, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 30, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_ServerImageViewer); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 30, __pyx_L1_error) + PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s_ServerImageViewer); + __pyx_t_2 = __Pyx_Import(__pyx_n_s_serverImageViewer, __pyx_t_1, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 30, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_ServerImageViewer, __pyx_t_2) < 0) __PYX_ERR(0, 30, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_ServerImageViewer); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 30, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_ServerImageViewer, __pyx_t_1) < 0) __PYX_ERR(0, 30, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; /* "kivyblocks/blocks.pyx":31 * from .utils import * @@ -26190,19 +26452,19 @@ if (!__Pyx_RefNanny) { * from .form import InputBox, Form, StrSearchForm * from .boxViewer import BoxViewer */ - __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 31, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 31, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_n_s_VPlayer); __Pyx_GIVEREF(__pyx_n_s_VPlayer); - PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s_VPlayer); - __pyx_t_2 = __Pyx_Import(__pyx_n_s_vplayer, __pyx_t_1, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 31, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_VPlayer); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 31, __pyx_L1_error) + PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s_VPlayer); + __pyx_t_1 = __Pyx_Import(__pyx_n_s_vplayer, __pyx_t_2, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 31, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_VPlayer, __pyx_t_1) < 0) __PYX_ERR(0, 31, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_VPlayer); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 31, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_VPlayer, __pyx_t_2) < 0) __PYX_ERR(0, 31, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; /* "kivyblocks/blocks.pyx":32 * from .serverImageViewer import ServerImageViewer @@ -26211,33 +26473,33 @@ if (!__Pyx_RefNanny) { * from .boxViewer import BoxViewer * from .tree import Tree, TextTree */ - __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 32, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); + __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 32, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_n_s_InputBox); __Pyx_GIVEREF(__pyx_n_s_InputBox); - PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s_InputBox); + PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s_InputBox); __Pyx_INCREF(__pyx_n_s_Form); __Pyx_GIVEREF(__pyx_n_s_Form); - PyList_SET_ITEM(__pyx_t_2, 1, __pyx_n_s_Form); + PyList_SET_ITEM(__pyx_t_1, 1, __pyx_n_s_Form); __Pyx_INCREF(__pyx_n_s_StrSearchForm); __Pyx_GIVEREF(__pyx_n_s_StrSearchForm); - PyList_SET_ITEM(__pyx_t_2, 2, __pyx_n_s_StrSearchForm); - __pyx_t_1 = __Pyx_Import(__pyx_n_s_form, __pyx_t_2, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 32, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_InputBox); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 32, __pyx_L1_error) + PyList_SET_ITEM(__pyx_t_1, 2, __pyx_n_s_StrSearchForm); + __pyx_t_2 = __Pyx_Import(__pyx_n_s_form, __pyx_t_1, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 32, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_InputBox, __pyx_t_2) < 0) __PYX_ERR(0, 32, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_Form); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 32, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_Form, __pyx_t_2) < 0) __PYX_ERR(0, 32, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_StrSearchForm); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 32, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_StrSearchForm, __pyx_t_2) < 0) __PYX_ERR(0, 32, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_InputBox); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 32, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_InputBox, __pyx_t_1) < 0) __PYX_ERR(0, 32, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_Form); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 32, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_Form, __pyx_t_1) < 0) __PYX_ERR(0, 32, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_StrSearchForm); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 32, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_StrSearchForm, __pyx_t_1) < 0) __PYX_ERR(0, 32, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; /* "kivyblocks/blocks.pyx":33 * from .vplayer import VPlayer @@ -26246,19 +26508,19 @@ if (!__Pyx_RefNanny) { * from .tree import Tree, TextTree * from .newvideo import Video */ - __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 33, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 33, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_n_s_BoxViewer); __Pyx_GIVEREF(__pyx_n_s_BoxViewer); - PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s_BoxViewer); - __pyx_t_2 = __Pyx_Import(__pyx_n_s_boxViewer, __pyx_t_1, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 33, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_BoxViewer); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 33, __pyx_L1_error) + PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s_BoxViewer); + __pyx_t_1 = __Pyx_Import(__pyx_n_s_boxViewer, __pyx_t_2, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 33, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_BoxViewer, __pyx_t_1) < 0) __PYX_ERR(0, 33, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_BoxViewer); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 33, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_BoxViewer, __pyx_t_2) < 0) __PYX_ERR(0, 33, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; /* "kivyblocks/blocks.pyx":34 * from .form import InputBox, Form, StrSearchForm @@ -26267,26 +26529,26 @@ if (!__Pyx_RefNanny) { * from .newvideo import Video * from .bgcolorbehavior import BGColorBehavior */ - __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 34, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); + __pyx_t_1 = PyList_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 34, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_n_s_Tree); __Pyx_GIVEREF(__pyx_n_s_Tree); - PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s_Tree); + PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s_Tree); __Pyx_INCREF(__pyx_n_s_TextTree); __Pyx_GIVEREF(__pyx_n_s_TextTree); - PyList_SET_ITEM(__pyx_t_2, 1, __pyx_n_s_TextTree); - __pyx_t_1 = __Pyx_Import(__pyx_n_s_tree, __pyx_t_2, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 34, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_Tree); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 34, __pyx_L1_error) + PyList_SET_ITEM(__pyx_t_1, 1, __pyx_n_s_TextTree); + __pyx_t_2 = __Pyx_Import(__pyx_n_s_tree, __pyx_t_1, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 34, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_Tree, __pyx_t_2) < 0) __PYX_ERR(0, 34, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_TextTree); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 34, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_TextTree, __pyx_t_2) < 0) __PYX_ERR(0, 34, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_Tree); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 34, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_Tree, __pyx_t_1) < 0) __PYX_ERR(0, 34, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_TextTree); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 34, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_TextTree, __pyx_t_1) < 0) __PYX_ERR(0, 34, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; /* "kivyblocks/blocks.pyx":35 * from .boxViewer import BoxViewer @@ -26295,19 +26557,19 @@ if (!__Pyx_RefNanny) { * from .bgcolorbehavior import BGColorBehavior * from .orientationlayout import OrientationLayout */ - __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 35, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 35, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_n_s_Video); __Pyx_GIVEREF(__pyx_n_s_Video); - PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s_Video); - __pyx_t_2 = __Pyx_Import(__pyx_n_s_newvideo, __pyx_t_1, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 35, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_Video); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 35, __pyx_L1_error) + PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s_Video); + __pyx_t_1 = __Pyx_Import(__pyx_n_s_newvideo, __pyx_t_2, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 35, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_Video, __pyx_t_1) < 0) __PYX_ERR(0, 35, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_Video); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 35, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_Video, __pyx_t_2) < 0) __PYX_ERR(0, 35, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; /* "kivyblocks/blocks.pyx":36 * from .tree import Tree, TextTree @@ -26316,19 +26578,19 @@ if (!__Pyx_RefNanny) { * from .orientationlayout import OrientationLayout * from .threadcall import HttpClient */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 36, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); + __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 36, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_n_s_BGColorBehavior); __Pyx_GIVEREF(__pyx_n_s_BGColorBehavior); - PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s_BGColorBehavior); - __pyx_t_1 = __Pyx_Import(__pyx_n_s_bgcolorbehavior, __pyx_t_2, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 36, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_BGColorBehavior); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 36, __pyx_L1_error) + PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s_BGColorBehavior); + __pyx_t_2 = __Pyx_Import(__pyx_n_s_bgcolorbehavior, __pyx_t_1, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 36, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_BGColorBehavior, __pyx_t_2) < 0) __PYX_ERR(0, 36, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_BGColorBehavior); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 36, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_BGColorBehavior, __pyx_t_1) < 0) __PYX_ERR(0, 36, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; /* "kivyblocks/blocks.pyx":37 * from .newvideo import Video @@ -26337,19 +26599,19 @@ if (!__Pyx_RefNanny) { * from .threadcall import HttpClient * from .register import * */ - __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 37, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 37, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_n_s_OrientationLayout); __Pyx_GIVEREF(__pyx_n_s_OrientationLayout); - PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s_OrientationLayout); - __pyx_t_2 = __Pyx_Import(__pyx_n_s_orientationlayout, __pyx_t_1, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 37, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_OrientationLayout); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 37, __pyx_L1_error) + PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s_OrientationLayout); + __pyx_t_1 = __Pyx_Import(__pyx_n_s_orientationlayout, __pyx_t_2, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 37, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_OrientationLayout, __pyx_t_1) < 0) __PYX_ERR(0, 37, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_OrientationLayout); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 37, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_OrientationLayout, __pyx_t_2) < 0) __PYX_ERR(0, 37, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; /* "kivyblocks/blocks.pyx":38 * from .bgcolorbehavior import BGColorBehavior @@ -26358,19 +26620,19 @@ if (!__Pyx_RefNanny) { * from .register import * * */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 38, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); + __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 38, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_n_s_HttpClient); __Pyx_GIVEREF(__pyx_n_s_HttpClient); - PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s_HttpClient); - __pyx_t_1 = __Pyx_Import(__pyx_n_s_threadcall, __pyx_t_2, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 38, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_1, __pyx_n_s_HttpClient); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 38, __pyx_L1_error) + PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s_HttpClient); + __pyx_t_2 = __Pyx_Import(__pyx_n_s_threadcall, __pyx_t_1, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 38, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_HttpClient, __pyx_t_2) < 0) __PYX_ERR(0, 38, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_HttpClient); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 38, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_HttpClient, __pyx_t_1) < 0) __PYX_ERR(0, 38, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; /* "kivyblocks/blocks.pyx":39 * from .orientationlayout import OrientationLayout @@ -26379,16 +26641,16 @@ if (!__Pyx_RefNanny) { * * class WidgetNotFoundById(Exception): */ - __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 39, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); + __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 39, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_n_s__28); __Pyx_GIVEREF(__pyx_n_s__28); - PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s__28); - __pyx_t_2 = __Pyx_Import(__pyx_n_s_register, __pyx_t_1, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 39, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - if (__pyx_import_star(__pyx_t_2) < 0) __PYX_ERR(0, 39, __pyx_L1_error); + PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s__28); + __pyx_t_1 = __Pyx_Import(__pyx_n_s_register, __pyx_t_2, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 39, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + if (__pyx_import_star(__pyx_t_1) < 0) __PYX_ERR(0, 39, __pyx_L1_error); + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; /* "kivyblocks/blocks.pyx":41 * from .register import * @@ -26397,14 +26659,14 @@ if (!__Pyx_RefNanny) { * def __init__(self, id): * super().__init__() */ - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 41, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); + __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 41, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); __Pyx_GIVEREF(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); - PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); - __pyx_t_1 = __Pyx_CalculateMetaclass(NULL, __pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 41, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = __Pyx_Py3MetaclassPrepare(__pyx_t_1, __pyx_t_2, __pyx_n_s_WidgetNotFoundById, __pyx_n_s_WidgetNotFoundById, (PyObject *) NULL, __pyx_n_s_kivyblocks_blocks, (PyObject *) NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 41, __pyx_L1_error) + PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); + __pyx_t_2 = __Pyx_CalculateMetaclass(NULL, __pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 41, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + __pyx_t_3 = __Pyx_Py3MetaclassPrepare(__pyx_t_2, __pyx_t_1, __pyx_n_s_WidgetNotFoundById, __pyx_n_s_WidgetNotFoundById, (PyObject *) NULL, __pyx_n_s_kivyblocks_blocks, (PyObject *) NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 41, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_4 = PyList_New(0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 41, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); @@ -26455,15 +26717,15 @@ if (!__Pyx_RefNanny) { * def __init__(self, id): * super().__init__() */ - __pyx_t_5 = __Pyx_Py3ClassCreate(__pyx_t_1, __pyx_n_s_WidgetNotFoundById, __pyx_t_2, __pyx_t_3, NULL, 0, 1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 41, __pyx_L1_error) + __pyx_t_5 = __Pyx_Py3ClassCreate(__pyx_t_2, __pyx_n_s_WidgetNotFoundById, __pyx_t_1, __pyx_t_3, NULL, 0, 1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 41, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); if (__Pyx_CyFunction_InitClassCell(__pyx_t_4, __pyx_t_5) < 0) __PYX_ERR(0, 41, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; if (PyDict_SetItem(__pyx_d, __pyx_n_s_WidgetNotFoundById, __pyx_t_5) < 0) __PYX_ERR(0, 41, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; /* "kivyblocks/blocks.pyx":52 * return str(self) @@ -26472,14 +26734,14 @@ if (!__Pyx_RefNanny) { * def __init__(self,k,m): * super().__init__() */ - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 52, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); + __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 52, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); __Pyx_GIVEREF(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); - PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); - __pyx_t_1 = __Pyx_CalculateMetaclass(NULL, __pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 52, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = __Pyx_Py3MetaclassPrepare(__pyx_t_1, __pyx_t_2, __pyx_n_s_ClassMethodNotFound, __pyx_n_s_ClassMethodNotFound, (PyObject *) NULL, __pyx_n_s_kivyblocks_blocks, (PyObject *) NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 52, __pyx_L1_error) + PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); + __pyx_t_2 = __Pyx_CalculateMetaclass(NULL, __pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 52, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + __pyx_t_3 = __Pyx_Py3MetaclassPrepare(__pyx_t_2, __pyx_t_1, __pyx_n_s_ClassMethodNotFound, __pyx_n_s_ClassMethodNotFound, (PyObject *) NULL, __pyx_n_s_kivyblocks_blocks, (PyObject *) NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 52, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_5 = PyList_New(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 52, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); @@ -26530,15 +26792,15 @@ if (!__Pyx_RefNanny) { * def __init__(self,k,m): * super().__init__() */ - __pyx_t_4 = __Pyx_Py3ClassCreate(__pyx_t_1, __pyx_n_s_ClassMethodNotFound, __pyx_t_2, __pyx_t_3, NULL, 0, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 52, __pyx_L1_error) + __pyx_t_4 = __Pyx_Py3ClassCreate(__pyx_t_2, __pyx_n_s_ClassMethodNotFound, __pyx_t_1, __pyx_t_3, NULL, 0, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 52, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); if (__Pyx_CyFunction_InitClassCell(__pyx_t_5, __pyx_t_4) < 0) __PYX_ERR(0, 52, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; if (PyDict_SetItem(__pyx_d, __pyx_n_s_ClassMethodNotFound, __pyx_t_4) < 0) __PYX_ERR(0, 52, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; /* "kivyblocks/blocks.pyx":67 * @@ -26547,14 +26809,14 @@ if (!__Pyx_RefNanny) { * def __init__(self,name): * super().__init__() */ - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 67, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); + __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 67, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); __Pyx_GIVEREF(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); - PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); - __pyx_t_1 = __Pyx_CalculateMetaclass(NULL, __pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 67, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = __Pyx_Py3MetaclassPrepare(__pyx_t_1, __pyx_t_2, __pyx_n_s_NotExistsObject, __pyx_n_s_NotExistsObject, (PyObject *) NULL, __pyx_n_s_kivyblocks_blocks, (PyObject *) NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 67, __pyx_L1_error) + PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); + __pyx_t_2 = __Pyx_CalculateMetaclass(NULL, __pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 67, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + __pyx_t_3 = __Pyx_Py3MetaclassPrepare(__pyx_t_2, __pyx_t_1, __pyx_n_s_NotExistsObject, __pyx_n_s_NotExistsObject, (PyObject *) NULL, __pyx_n_s_kivyblocks_blocks, (PyObject *) NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 67, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_4 = PyList_New(0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 67, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); @@ -26605,15 +26867,15 @@ if (!__Pyx_RefNanny) { * def __init__(self,name): * super().__init__() */ - __pyx_t_5 = __Pyx_Py3ClassCreate(__pyx_t_1, __pyx_n_s_NotExistsObject, __pyx_t_2, __pyx_t_3, NULL, 0, 1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 67, __pyx_L1_error) + __pyx_t_5 = __Pyx_Py3ClassCreate(__pyx_t_2, __pyx_n_s_NotExistsObject, __pyx_t_1, __pyx_t_3, NULL, 0, 1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 67, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); if (__Pyx_CyFunction_InitClassCell(__pyx_t_4, __pyx_t_5) < 0) __PYX_ERR(0, 67, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; if (PyDict_SetItem(__pyx_d, __pyx_n_s_NotExistsObject, __pyx_t_5) < 0) __PYX_ERR(0, 67, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; /* "kivyblocks/blocks.pyx":79 * return self.__str__() @@ -26622,14 +26884,14 @@ if (!__Pyx_RefNanny) { * def __init__(self,argument,desc): * super().__init__() */ - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 79, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); + __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 79, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); __Pyx_GIVEREF(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); - PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); - __pyx_t_1 = __Pyx_CalculateMetaclass(NULL, __pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 79, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = __Pyx_Py3MetaclassPrepare(__pyx_t_1, __pyx_t_2, __pyx_n_s_ArgumentError, __pyx_n_s_ArgumentError, (PyObject *) NULL, __pyx_n_s_kivyblocks_blocks, (PyObject *) NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 79, __pyx_L1_error) + PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); + __pyx_t_2 = __Pyx_CalculateMetaclass(NULL, __pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 79, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + __pyx_t_3 = __Pyx_Py3MetaclassPrepare(__pyx_t_2, __pyx_t_1, __pyx_n_s_ArgumentError, __pyx_n_s_ArgumentError, (PyObject *) NULL, __pyx_n_s_kivyblocks_blocks, (PyObject *) NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 79, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_5 = PyList_New(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 79, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); @@ -26680,15 +26942,15 @@ if (!__Pyx_RefNanny) { * def __init__(self,argument,desc): * super().__init__() */ - __pyx_t_4 = __Pyx_Py3ClassCreate(__pyx_t_1, __pyx_n_s_ArgumentError, __pyx_t_2, __pyx_t_3, NULL, 0, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 79, __pyx_L1_error) + __pyx_t_4 = __Pyx_Py3ClassCreate(__pyx_t_2, __pyx_n_s_ArgumentError, __pyx_t_1, __pyx_t_3, NULL, 0, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 79, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); if (__Pyx_CyFunction_InitClassCell(__pyx_t_5, __pyx_t_4) < 0) __PYX_ERR(0, 79, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; if (PyDict_SetItem(__pyx_d, __pyx_n_s_ArgumentError, __pyx_t_4) < 0) __PYX_ERR(0, 79, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; /* "kivyblocks/blocks.pyx":93 * @@ -26697,14 +26959,14 @@ if (!__Pyx_RefNanny) { * def __init__(self, name:str): * super().__init__() */ - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 93, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); + __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 93, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); __Pyx_GIVEREF(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); - PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); - __pyx_t_1 = __Pyx_CalculateMetaclass(NULL, __pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 93, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = __Pyx_Py3MetaclassPrepare(__pyx_t_1, __pyx_t_2, __pyx_n_s_NotRegistedWidget, __pyx_n_s_NotRegistedWidget, (PyObject *) NULL, __pyx_n_s_kivyblocks_blocks, (PyObject *) NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 93, __pyx_L1_error) + PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); + __pyx_t_2 = __Pyx_CalculateMetaclass(NULL, __pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 93, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + __pyx_t_3 = __Pyx_Py3MetaclassPrepare(__pyx_t_2, __pyx_t_1, __pyx_n_s_NotRegistedWidget, __pyx_n_s_NotRegistedWidget, (PyObject *) NULL, __pyx_n_s_kivyblocks_blocks, (PyObject *) NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 93, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_4 = PyList_New(0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 93, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); @@ -26760,15 +27022,15 @@ if (!__Pyx_RefNanny) { * def __init__(self, name:str): * super().__init__() */ - __pyx_t_6 = __Pyx_Py3ClassCreate(__pyx_t_1, __pyx_n_s_NotRegistedWidget, __pyx_t_2, __pyx_t_3, NULL, 0, 1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 93, __pyx_L1_error) + __pyx_t_6 = __Pyx_Py3ClassCreate(__pyx_t_2, __pyx_n_s_NotRegistedWidget, __pyx_t_1, __pyx_t_3, NULL, 0, 1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 93, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); if (__Pyx_CyFunction_InitClassCell(__pyx_t_4, __pyx_t_6) < 0) __PYX_ERR(0, 93, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; if (PyDict_SetItem(__pyx_d, __pyx_n_s_NotRegistedWidget, __pyx_t_6) < 0) __PYX_ERR(0, 93, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; /* "kivyblocks/blocks.pyx":105 * return self.__str__() @@ -26777,10 +27039,10 @@ if (!__Pyx_RefNanny) { * globals()[name] = widget * */ - __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_10kivyblocks_6blocks_1registerWidget, NULL, __pyx_n_s_kivyblocks_blocks); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 105, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_registerWidget, __pyx_t_2) < 0) __PYX_ERR(0, 105, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_t_1 = PyCFunction_NewEx(&__pyx_mdef_10kivyblocks_6blocks_1registerWidget, NULL, __pyx_n_s_kivyblocks_blocks); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 105, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_registerWidget, __pyx_t_1) < 0) __PYX_ERR(0, 105, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; /* "kivyblocks/blocks.pyx":109 * @@ -26789,16 +27051,16 @@ if (!__Pyx_RefNanny) { * def __init__(self): * EventDispatcher.__init__(self) */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_EventDispatcher); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 109, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 109, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_EventDispatcher); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 109, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __Pyx_GIVEREF(__pyx_t_2); - PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_2); - __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_CalculateMetaclass(NULL, __pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 109, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 109, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = __Pyx_Py3MetaclassPrepare(__pyx_t_2, __pyx_t_1, __pyx_n_s_Blocks, __pyx_n_s_Blocks, (PyObject *) NULL, __pyx_n_s_kivyblocks_blocks, (PyObject *) NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 109, __pyx_L1_error) + __Pyx_GIVEREF(__pyx_t_1); + PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1); + __pyx_t_1 = 0; + __pyx_t_1 = __Pyx_CalculateMetaclass(NULL, __pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 109, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + __pyx_t_3 = __Pyx_Py3MetaclassPrepare(__pyx_t_1, __pyx_t_2, __pyx_n_s_Blocks, __pyx_n_s_Blocks, (PyObject *) NULL, __pyx_n_s_kivyblocks_blocks, (PyObject *) NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 109, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); /* "kivyblocks/blocks.pyx":110 @@ -26871,54 +27133,54 @@ if (!__Pyx_RefNanny) { if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_buildAction, __pyx_t_4) < 0) __PYX_ERR(0, 123, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":132 - * + /* "kivyblocks/blocks.pyx":131 + * return func * * def eval(self, s:str, l:dict): # <<<<<<<<<<<<<< * g = {} * forbidens = [ */ - __pyx_t_4 = __Pyx_PyDict_NewPresized(2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 132, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyDict_NewPresized(2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 131, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_s, __pyx_n_u_str_2) < 0) __PYX_ERR(0, 132, __pyx_L1_error) - if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_l, __pyx_n_u_dict) < 0) __PYX_ERR(0, 132, __pyx_L1_error) - __pyx_t_6 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_9eval, 0, __pyx_n_s_Blocks_eval, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__70)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 132, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_s, __pyx_n_u_str_2) < 0) __PYX_ERR(0, 131, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_l, __pyx_n_u_dict) < 0) __PYX_ERR(0, 131, __pyx_L1_error) + __pyx_t_6 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_9eval, 0, __pyx_n_s_Blocks_eval, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__70)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 131, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_CyFunction_SetAnnotationsDict(__pyx_t_6, __pyx_t_4); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_eval, __pyx_t_6) < 0) __PYX_ERR(0, 132, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_eval, __pyx_t_6) < 0) __PYX_ERR(0, 131, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - /* "kivyblocks/blocks.pyx":154 + /* "kivyblocks/blocks.pyx":153 * return eval(s,g,l) * * def getUrlData(self, url:str, method:str='GET', # <<<<<<<<<<<<<< * params:dict={}, files:dict={}, * callback=None, */ - __pyx_t_6 = __Pyx_PyDict_NewPresized(4); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 154, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyDict_NewPresized(4); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 153, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_url, __pyx_n_u_str_2) < 0) __PYX_ERR(0, 154, __pyx_L1_error) - if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_method, __pyx_n_u_str_2) < 0) __PYX_ERR(0, 154, __pyx_L1_error) - if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_params, __pyx_n_u_dict) < 0) __PYX_ERR(0, 154, __pyx_L1_error) - if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_files, __pyx_n_u_dict) < 0) __PYX_ERR(0, 154, __pyx_L1_error) - __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_11getUrlData, 0, __pyx_n_s_Blocks_getUrlData, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__72)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 154, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_url, __pyx_n_u_str_2) < 0) __PYX_ERR(0, 153, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_method, __pyx_n_u_str_2) < 0) __PYX_ERR(0, 153, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_params, __pyx_n_u_dict) < 0) __PYX_ERR(0, 153, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_files, __pyx_n_u_dict) < 0) __PYX_ERR(0, 153, __pyx_L1_error) + __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_11getUrlData, 0, __pyx_n_s_Blocks_getUrlData, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__72)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 153, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (!__Pyx_CyFunction_InitDefaults(__pyx_t_4, sizeof(__pyx_defaults), 2)) __PYX_ERR(0, 154, __pyx_L1_error) + if (!__Pyx_CyFunction_InitDefaults(__pyx_t_4, sizeof(__pyx_defaults), 2)) __PYX_ERR(0, 153, __pyx_L1_error) - /* "kivyblocks/blocks.pyx":155 + /* "kivyblocks/blocks.pyx":154 * * def getUrlData(self, url:str, method:str='GET', * params:dict={}, files:dict={}, # <<<<<<<<<<<<<< * callback=None, * errback=None,**kw): */ - __pyx_t_5 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 155, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 154, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_CyFunction_Defaults(__pyx_defaults, __pyx_t_4)->__pyx_arg_params = ((PyObject*)__pyx_t_5); __Pyx_GIVEREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 155, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 154, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_CyFunction_Defaults(__pyx_defaults, __pyx_t_4)->__pyx_arg_files = ((PyObject*)__pyx_t_5); __Pyx_GIVEREF(__pyx_t_5); @@ -26926,24 +27188,24 @@ if (!__Pyx_RefNanny) { __Pyx_CyFunction_SetDefaultsGetter(__pyx_t_4, __pyx_pf_10kivyblocks_6blocks_2__defaults__); __Pyx_CyFunction_SetAnnotationsDict(__pyx_t_4, __pyx_t_6); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_getUrlData, __pyx_t_4) < 0) __PYX_ERR(0, 154, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_getUrlData, __pyx_t_4) < 0) __PYX_ERR(0, 153, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":190 + /* "kivyblocks/blocks.pyx":189 * **kw) * * def strValueExpr(self,s:str,localnamespace:dict={}): # <<<<<<<<<<<<<< * if not s.startswith('py::'): * return s */ - __pyx_t_4 = __Pyx_PyDict_NewPresized(2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 190, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyDict_NewPresized(2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 189, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_s, __pyx_n_u_str_2) < 0) __PYX_ERR(0, 190, __pyx_L1_error) - if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_localnamespace, __pyx_n_u_dict) < 0) __PYX_ERR(0, 190, __pyx_L1_error) - __pyx_t_6 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_13strValueExpr, 0, __pyx_n_s_Blocks_strValueExpr, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__74)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 190, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_s, __pyx_n_u_str_2) < 0) __PYX_ERR(0, 189, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_localnamespace, __pyx_n_u_dict) < 0) __PYX_ERR(0, 189, __pyx_L1_error) + __pyx_t_6 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_13strValueExpr, 0, __pyx_n_s_Blocks_strValueExpr, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__74)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 189, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - if (!__Pyx_CyFunction_InitDefaults(__pyx_t_6, sizeof(__pyx_defaults1), 1)) __PYX_ERR(0, 190, __pyx_L1_error) - __pyx_t_5 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 190, __pyx_L1_error) + if (!__Pyx_CyFunction_InitDefaults(__pyx_t_6, sizeof(__pyx_defaults1), 1)) __PYX_ERR(0, 189, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 189, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_CyFunction_Defaults(__pyx_defaults1, __pyx_t_6)->__pyx_arg_localnamespace = ((PyObject*)__pyx_t_5); __Pyx_GIVEREF(__pyx_t_5); @@ -26951,25 +27213,25 @@ if (!__Pyx_RefNanny) { __Pyx_CyFunction_SetDefaultsGetter(__pyx_t_6, __pyx_pf_10kivyblocks_6blocks_4__defaults__); __Pyx_CyFunction_SetAnnotationsDict(__pyx_t_6, __pyx_t_4); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_strValueExpr, __pyx_t_6) < 0) __PYX_ERR(0, 190, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_strValueExpr, __pyx_t_6) < 0) __PYX_ERR(0, 189, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - /* "kivyblocks/blocks.pyx":202 + /* "kivyblocks/blocks.pyx":201 * return s * * def arrayValueExpr(self,arr:list,localnamespace:dict={}) -> list: # <<<<<<<<<<<<<< * d = [] * for v in arr: */ - __pyx_t_6 = __Pyx_PyDict_NewPresized(3); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 202, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyDict_NewPresized(3); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 201, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_arr, __pyx_n_u_list) < 0) __PYX_ERR(0, 202, __pyx_L1_error) - if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_localnamespace, __pyx_n_u_dict) < 0) __PYX_ERR(0, 202, __pyx_L1_error) - if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_return, __pyx_n_u_list) < 0) __PYX_ERR(0, 202, __pyx_L1_error) - __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_15arrayValueExpr, 0, __pyx_n_s_Blocks_arrayValueExpr, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__76)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 202, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_arr, __pyx_n_u_list) < 0) __PYX_ERR(0, 201, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_localnamespace, __pyx_n_u_dict) < 0) __PYX_ERR(0, 201, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_return, __pyx_n_u_list) < 0) __PYX_ERR(0, 201, __pyx_L1_error) + __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_15arrayValueExpr, 0, __pyx_n_s_Blocks_arrayValueExpr, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__76)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 201, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (!__Pyx_CyFunction_InitDefaults(__pyx_t_4, sizeof(__pyx_defaults2), 1)) __PYX_ERR(0, 202, __pyx_L1_error) - __pyx_t_5 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 202, __pyx_L1_error) + if (!__Pyx_CyFunction_InitDefaults(__pyx_t_4, sizeof(__pyx_defaults2), 1)) __PYX_ERR(0, 201, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 201, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_CyFunction_Defaults(__pyx_defaults2, __pyx_t_4)->__pyx_arg_localnamespace = ((PyObject*)__pyx_t_5); __Pyx_GIVEREF(__pyx_t_5); @@ -26977,25 +27239,25 @@ if (!__Pyx_RefNanny) { __Pyx_CyFunction_SetDefaultsGetter(__pyx_t_4, __pyx_pf_10kivyblocks_6blocks_6__defaults__); __Pyx_CyFunction_SetAnnotationsDict(__pyx_t_4, __pyx_t_6); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_arrayValueExpr, __pyx_t_4) < 0) __PYX_ERR(0, 202, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_arrayValueExpr, __pyx_t_4) < 0) __PYX_ERR(0, 201, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":220 + /* "kivyblocks/blocks.pyx":219 * return d * * def dictValueExpr(self,dic:dict,localnamespace:dict={}) -> dict: # <<<<<<<<<<<<<< * d = {} * for k,v in dic.items(): */ - __pyx_t_4 = __Pyx_PyDict_NewPresized(3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 220, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyDict_NewPresized(3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 219, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dic, __pyx_n_u_dict) < 0) __PYX_ERR(0, 220, __pyx_L1_error) - if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_localnamespace, __pyx_n_u_dict) < 0) __PYX_ERR(0, 220, __pyx_L1_error) - if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_return, __pyx_n_u_dict) < 0) __PYX_ERR(0, 220, __pyx_L1_error) - __pyx_t_6 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_17dictValueExpr, 0, __pyx_n_s_Blocks_dictValueExpr, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__78)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 220, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dic, __pyx_n_u_dict) < 0) __PYX_ERR(0, 219, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_localnamespace, __pyx_n_u_dict) < 0) __PYX_ERR(0, 219, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_return, __pyx_n_u_dict) < 0) __PYX_ERR(0, 219, __pyx_L1_error) + __pyx_t_6 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_17dictValueExpr, 0, __pyx_n_s_Blocks_dictValueExpr, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__78)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 219, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - if (!__Pyx_CyFunction_InitDefaults(__pyx_t_6, sizeof(__pyx_defaults3), 1)) __PYX_ERR(0, 220, __pyx_L1_error) - __pyx_t_5 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 220, __pyx_L1_error) + if (!__Pyx_CyFunction_InitDefaults(__pyx_t_6, sizeof(__pyx_defaults3), 1)) __PYX_ERR(0, 219, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 219, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_CyFunction_Defaults(__pyx_defaults3, __pyx_t_6)->__pyx_arg_localnamespace = ((PyObject*)__pyx_t_5); __Pyx_GIVEREF(__pyx_t_5); @@ -27003,23 +27265,23 @@ if (!__Pyx_RefNanny) { __Pyx_CyFunction_SetDefaultsGetter(__pyx_t_6, __pyx_pf_10kivyblocks_6blocks_8__defaults__); __Pyx_CyFunction_SetAnnotationsDict(__pyx_t_6, __pyx_t_4); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_dictValueExpr, __pyx_t_6) < 0) __PYX_ERR(0, 220, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_dictValueExpr, __pyx_t_6) < 0) __PYX_ERR(0, 219, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - /* "kivyblocks/blocks.pyx":237 + /* "kivyblocks/blocks.pyx":236 * d[k] = v * return d * def valueExpr(self,obj,localnamespace:dict={}): # <<<<<<<<<<<<<< * if type(obj) == type(''): * return self.strValueExpr(obj,localnamespace) */ - __pyx_t_6 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 237, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 236, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_localnamespace, __pyx_n_u_dict) < 0) __PYX_ERR(0, 237, __pyx_L1_error) - __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_19valueExpr, 0, __pyx_n_s_Blocks_valueExpr, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__80)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 237, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_localnamespace, __pyx_n_u_dict) < 0) __PYX_ERR(0, 236, __pyx_L1_error) + __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_19valueExpr, 0, __pyx_n_s_Blocks_valueExpr, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__80)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 236, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (!__Pyx_CyFunction_InitDefaults(__pyx_t_4, sizeof(__pyx_defaults4), 1)) __PYX_ERR(0, 237, __pyx_L1_error) - __pyx_t_5 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 237, __pyx_L1_error) + if (!__Pyx_CyFunction_InitDefaults(__pyx_t_4, sizeof(__pyx_defaults4), 1)) __PYX_ERR(0, 236, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 236, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_CyFunction_Defaults(__pyx_defaults4, __pyx_t_4)->__pyx_arg_localnamespace = ((PyObject*)__pyx_t_5); __Pyx_GIVEREF(__pyx_t_5); @@ -27027,416 +27289,416 @@ if (!__Pyx_RefNanny) { __Pyx_CyFunction_SetDefaultsGetter(__pyx_t_4, __pyx_pf_10kivyblocks_6blocks_10__defaults__); __Pyx_CyFunction_SetAnnotationsDict(__pyx_t_4, __pyx_t_6); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_valueExpr, __pyx_t_4) < 0) __PYX_ERR(0, 237, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_valueExpr, __pyx_t_4) < 0) __PYX_ERR(0, 236, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":248 + /* "kivyblocks/blocks.pyx":247 * return obj * * def w_build(self,desc) -> Widget: # <<<<<<<<<<<<<< * # print('w_build(),desc=',desc) * widgetClass = desc.get('widgettype',None) */ - __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 248, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 247, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_Widget); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 248, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_Widget); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 247, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_return, __pyx_t_6) < 0) __PYX_ERR(0, 248, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_return, __pyx_t_6) < 0) __PYX_ERR(0, 247, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __pyx_t_6 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_21w_build, 0, __pyx_n_s_Blocks_w_build, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__82)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 248, __pyx_L1_error) + __pyx_t_6 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_21w_build, 0, __pyx_n_s_Blocks_w_build, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__82)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 247, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_CyFunction_SetAnnotationsDict(__pyx_t_6, __pyx_t_4); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_w_build, __pyx_t_6) < 0) __PYX_ERR(0, 248, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_w_build, __pyx_t_6) < 0) __PYX_ERR(0, 247, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - /* "kivyblocks/blocks.pyx":287 + /* "kivyblocks/blocks.pyx":286 * return widget * * def build_attributes(self, widget:Widget,desc,t=None): # <<<<<<<<<<<<<< * excludes = ['widgettype','options','subwidgets','binds'] * for k,v in [(k,v) for k,v in desc.items() if k not in excludes]: */ - __pyx_t_6 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 287, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 286, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_Widget); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 287, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_Widget); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 286, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_widget, __pyx_t_4) < 0) __PYX_ERR(0, 287, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_widget, __pyx_t_4) < 0) __PYX_ERR(0, 286, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_23build_attributes, 0, __pyx_n_s_Blocks_build_attributes, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__84)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 287, __pyx_L1_error) + __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_23build_attributes, 0, __pyx_n_s_Blocks_build_attributes, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__84)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 286, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_CyFunction_SetDefaultsTuple(__pyx_t_4, __pyx_tuple__85); __Pyx_CyFunction_SetAnnotationsDict(__pyx_t_4, __pyx_t_6); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_build_attributes, __pyx_t_4) < 0) __PYX_ERR(0, 287, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_build_attributes, __pyx_t_4) < 0) __PYX_ERR(0, 286, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":304 + /* "kivyblocks/blocks.pyx":303 * localnamespace={'self':widget})) * * def build_rest(self, widget:Widget,desc,t=None): # <<<<<<<<<<<<<< * self.subwidget_total = len(desc.get('subwidgets',[])) * self.subwidgets = [ None for i in range(self.subwidget_total)] */ - __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 304, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 303, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_Widget); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 304, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_Widget); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 303, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_widget, __pyx_t_6) < 0) __PYX_ERR(0, 304, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_widget, __pyx_t_6) < 0) __PYX_ERR(0, 303, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __pyx_t_6 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_25build_rest, 0, __pyx_n_s_Blocks_build_rest, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__87)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 304, __pyx_L1_error) + __pyx_t_6 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_25build_rest, 0, __pyx_n_s_Blocks_build_rest, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__87)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 303, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_CyFunction_SetDefaultsTuple(__pyx_t_6, __pyx_tuple__88); __Pyx_CyFunction_SetAnnotationsDict(__pyx_t_6, __pyx_t_4); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_build_rest, __pyx_t_6) < 0) __PYX_ERR(0, 304, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_build_rest, __pyx_t_6) < 0) __PYX_ERR(0, 303, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - /* "kivyblocks/blocks.pyx":320 + /* "kivyblocks/blocks.pyx":319 * self.buildBind(widget,kw) * * def buildBind(self, widget:Widget, desc): # <<<<<<<<<<<<<< * wid = desc.get('wid','self') * w = Blocks.getWidgetById(desc.get('wid','self'),from_widget=widget) */ - __pyx_t_6 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 320, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 319, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_Widget); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 320, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_Widget); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 319, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_widget, __pyx_t_4) < 0) __PYX_ERR(0, 320, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_widget, __pyx_t_4) < 0) __PYX_ERR(0, 319, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_27buildBind, 0, __pyx_n_s_Blocks_buildBind, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__90)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 320, __pyx_L1_error) + __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_27buildBind, 0, __pyx_n_s_Blocks_buildBind, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__90)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 319, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_CyFunction_SetAnnotationsDict(__pyx_t_4, __pyx_t_6); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_buildBind, __pyx_t_4) < 0) __PYX_ERR(0, 320, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_buildBind, __pyx_t_4) < 0) __PYX_ERR(0, 319, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":338 + /* "kivyblocks/blocks.pyx":337 * # Logger.info('Block: %s bind built', str(desc)) * * def multipleAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< * desc1 = {k:v for k, v in desc.items() if k != 'actions'} * mydesc = desc1.copy() */ - __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 338, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 337, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_Widget); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 338, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_Widget); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 337, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_widget, __pyx_t_6) < 0) __PYX_ERR(0, 338, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_widget, __pyx_t_6) < 0) __PYX_ERR(0, 337, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __pyx_t_6 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_29multipleAction, 0, __pyx_n_s_Blocks_multipleAction, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__92)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 338, __pyx_L1_error) + __pyx_t_6 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_29multipleAction, 0, __pyx_n_s_Blocks_multipleAction, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__92)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 337, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_CyFunction_SetAnnotationsDict(__pyx_t_6, __pyx_t_4); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_multipleAction, __pyx_t_6) < 0) __PYX_ERR(0, 338, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_multipleAction, __pyx_t_6) < 0) __PYX_ERR(0, 337, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - /* "kivyblocks/blocks.pyx":346 + /* "kivyblocks/blocks.pyx":345 * self.uniaction(widget,new_desc, *args) * * def conform_action(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< * conform_desc = desc.get('conform') * blocks = Blocks() */ - __pyx_t_6 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 346, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 345, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_Widget); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 346, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_Widget); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 345, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_widget, __pyx_t_4) < 0) __PYX_ERR(0, 346, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_widget, __pyx_t_4) < 0) __PYX_ERR(0, 345, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_31conform_action, 0, __pyx_n_s_Blocks_conform_action, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__94)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 346, __pyx_L1_error) + __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_31conform_action, 0, __pyx_n_s_Blocks_conform_action, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__94)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 345, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_CyFunction_SetAnnotationsDict(__pyx_t_4, __pyx_t_6); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_conform_action, __pyx_t_4) < 0) __PYX_ERR(0, 346, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_conform_action, __pyx_t_4) < 0) __PYX_ERR(0, 345, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":359 + /* "kivyblocks/blocks.pyx":358 * w.open() * * def uniaction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< * Logger.info('Block: uniaction() called, desc=%s, args=%s', \ * str(desc), */ - __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 359, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 358, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_Widget); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 359, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_Widget); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 358, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_widget, __pyx_t_6) < 0) __PYX_ERR(0, 359, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_widget, __pyx_t_6) < 0) __PYX_ERR(0, 358, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __pyx_t_6 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_33uniaction, 0, __pyx_n_s_Blocks_uniaction, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__96)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 359, __pyx_L1_error) + __pyx_t_6 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_33uniaction, 0, __pyx_n_s_Blocks_uniaction, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__96)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 358, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_CyFunction_SetAnnotationsDict(__pyx_t_6, __pyx_t_4); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_uniaction, __pyx_t_6) < 0) __PYX_ERR(0, 359, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_uniaction, __pyx_t_6) < 0) __PYX_ERR(0, 358, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - /* "kivyblocks/blocks.pyx":383 + /* "kivyblocks/blocks.pyx":382 * alert("actiontype(%s) invalid" % acttype,title='error') * * def eventAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< * target = self.get_target(widget, desc) * event = desc.get('dispatch_event') */ - __pyx_t_6 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 383, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 382, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_Widget); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 383, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_Widget); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 382, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_widget, __pyx_t_4) < 0) __PYX_ERR(0, 383, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_widget, __pyx_t_4) < 0) __PYX_ERR(0, 382, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_35eventAction, 0, __pyx_n_s_Blocks_eventAction, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__98)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 383, __pyx_L1_error) + __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_35eventAction, 0, __pyx_n_s_Blocks_eventAction, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__98)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 382, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_CyFunction_SetAnnotationsDict(__pyx_t_4, __pyx_t_6); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_eventAction, __pyx_t_4) < 0) __PYX_ERR(0, 383, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_eventAction, __pyx_t_4) < 0) __PYX_ERR(0, 382, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":401 + /* "kivyblocks/blocks.pyx":400 * return * * def get_target(self, widget:Widget, desc): # <<<<<<<<<<<<<< * if not desc.get('target'): * return None */ - __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 401, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 400, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_Widget); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 401, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_Widget); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 400, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_widget, __pyx_t_6) < 0) __PYX_ERR(0, 401, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_widget, __pyx_t_6) < 0) __PYX_ERR(0, 400, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __pyx_t_6 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_37get_target, 0, __pyx_n_s_Blocks_get_target, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__100)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 401, __pyx_L1_error) + __pyx_t_6 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_37get_target, 0, __pyx_n_s_Blocks_get_target, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__100)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 400, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_CyFunction_SetAnnotationsDict(__pyx_t_6, __pyx_t_4); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_get_target, __pyx_t_6) < 0) __PYX_ERR(0, 401, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_get_target, __pyx_t_6) < 0) __PYX_ERR(0, 400, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - /* "kivyblocks/blocks.pyx":406 + /* "kivyblocks/blocks.pyx":405 * return Blocks.getWidgetById(desc.get('target'),from_widget=widget) * * def blocksAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< * target = self.get_target(widget, desc) * add_mode = desc.get('mode','replace') */ - __pyx_t_6 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 406, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 405, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_Widget); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 406, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_Widget); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 405, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_widget, __pyx_t_4) < 0) __PYX_ERR(0, 406, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_widget, __pyx_t_4) < 0) __PYX_ERR(0, 405, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_39blocksAction, 0, __pyx_n_s_Blocks_blocksAction, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__102)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 406, __pyx_L1_error) + __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_39blocksAction, 0, __pyx_n_s_Blocks_blocksAction, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__102)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 405, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_CyFunction_SetAnnotationsDict(__pyx_t_4, __pyx_t_6); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_blocksAction, __pyx_t_4) < 0) __PYX_ERR(0, 406, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_blocksAction, __pyx_t_4) < 0) __PYX_ERR(0, 405, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":431 + /* "kivyblocks/blocks.pyx":433 * b.widgetBuild(opts) * * def urlwidgetAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< - * target = self.get_target(widget, desc) - * add_mode = desc.get('mode','replace') + * Logger.info('Block: urlwidgetAction() called, desc=%s, args=%s', \ + * str(desc), */ - __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 431, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 433, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_Widget); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 431, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_Widget); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 433, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_widget, __pyx_t_6) < 0) __PYX_ERR(0, 431, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_widget, __pyx_t_6) < 0) __PYX_ERR(0, 433, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __pyx_t_6 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_41urlwidgetAction, 0, __pyx_n_s_Blocks_urlwidgetAction, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__104)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 431, __pyx_L1_error) + __pyx_t_6 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_41urlwidgetAction, 0, __pyx_n_s_Blocks_urlwidgetAction, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__104)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 433, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_CyFunction_SetAnnotationsDict(__pyx_t_6, __pyx_t_4); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_urlwidgetAction, __pyx_t_6) < 0) __PYX_ERR(0, 431, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_urlwidgetAction, __pyx_t_6) < 0) __PYX_ERR(0, 433, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - /* "kivyblocks/blocks.pyx":462 + /* "kivyblocks/blocks.pyx":471 * b.widgetBuild(d) * - * def getActionData(self, widget:Widget, desc,*args): # <<<<<<<<<<<<<< - * data = {} - * rtdesc = self.build_rtdesc(desc) + * def getActionData(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< + * Logger.info('Block: getActionData(): desc=%s args=%s' + * ,str(desc), args) */ - __pyx_t_6 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 462, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 471, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_Widget); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 462, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_Widget); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 471, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_widget, __pyx_t_4) < 0) __PYX_ERR(0, 462, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_widget, __pyx_t_4) < 0) __PYX_ERR(0, 471, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_43getActionData, 0, __pyx_n_s_Blocks_getActionData, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__106)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 462, __pyx_L1_error) + __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_43getActionData, 0, __pyx_n_s_Blocks_getActionData, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__106)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 471, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_CyFunction_SetAnnotationsDict(__pyx_t_4, __pyx_t_6); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_getActionData, __pyx_t_4) < 0) __PYX_ERR(0, 462, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_getActionData, __pyx_t_4) < 0) __PYX_ERR(0, 471, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":471 + /* "kivyblocks/blocks.pyx":485 * return data * * def registedfunctionAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< * target = self.get_target(widget, desc) * rf = RegisterFunction() */ - __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 471, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 485, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_Widget); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 471, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_Widget); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 485, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_widget, __pyx_t_6) < 0) __PYX_ERR(0, 471, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_widget, __pyx_t_6) < 0) __PYX_ERR(0, 485, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __pyx_t_6 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_45registedfunctionAction, 0, __pyx_n_s_Blocks_registedfunctionAction, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__108)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 471, __pyx_L1_error) + __pyx_t_6 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_45registedfunctionAction, 0, __pyx_n_s_Blocks_registedfunctionAction, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__108)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 485, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_CyFunction_SetAnnotationsDict(__pyx_t_6, __pyx_t_4); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_registedfunctionAction, __pyx_t_6) < 0) __PYX_ERR(0, 471, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_registedfunctionAction, __pyx_t_6) < 0) __PYX_ERR(0, 485, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - /* "kivyblocks/blocks.pyx":487 + /* "kivyblocks/blocks.pyx":501 * func(target, *args, **params) * * def scriptAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< * script = desc.get('script') * if not script: */ - __pyx_t_6 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 487, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 501, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_Widget); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 487, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_Widget); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 501, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_widget, __pyx_t_4) < 0) __PYX_ERR(0, 487, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_widget, __pyx_t_4) < 0) __PYX_ERR(0, 501, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_47scriptAction, 0, __pyx_n_s_Blocks_scriptAction, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__110)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 487, __pyx_L1_error) + __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_47scriptAction, 0, __pyx_n_s_Blocks_scriptAction, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__110)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 501, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_CyFunction_SetAnnotationsDict(__pyx_t_4, __pyx_t_6); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_scriptAction, __pyx_t_4) < 0) __PYX_ERR(0, 487, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_scriptAction, __pyx_t_4) < 0) __PYX_ERR(0, 501, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":508 + /* "kivyblocks/blocks.pyx":522 * print(e) * * def build_rtdesc(self, desc): # <<<<<<<<<<<<<< * rtdesc = desc.get('rtdata') * if not rtdesc: */ - __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_49build_rtdesc, 0, __pyx_n_s_Blocks_build_rtdesc, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__112)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 508, __pyx_L1_error) + __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_49build_rtdesc, 0, __pyx_n_s_Blocks_build_rtdesc, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__112)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 522, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_build_rtdesc, __pyx_t_4) < 0) __PYX_ERR(0, 508, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_build_rtdesc, __pyx_t_4) < 0) __PYX_ERR(0, 522, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":523 + /* "kivyblocks/blocks.pyx":535 * return rtdesc * * def get_rtdata(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< * """ * desc descript follow attributes */ - __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 523, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 535, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_Widget); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 523, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_Widget); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 535, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_widget, __pyx_t_6) < 0) __PYX_ERR(0, 523, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_widget, __pyx_t_6) < 0) __PYX_ERR(0, 535, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __pyx_t_6 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_51get_rtdata, 0, __pyx_n_s_Blocks_get_rtdata, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__114)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 523, __pyx_L1_error) + __pyx_t_6 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_51get_rtdata, 0, __pyx_n_s_Blocks_get_rtdata, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__114)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 535, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_CyFunction_SetAnnotationsDict(__pyx_t_6, __pyx_t_4); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_get_rtdata, __pyx_t_6) < 0) __PYX_ERR(0, 523, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_get_rtdata, __pyx_t_6) < 0) __PYX_ERR(0, 535, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - /* "kivyblocks/blocks.pyx":576 + /* "kivyblocks/blocks.pyx":588 * return {} * * def methodAction(self, widget:Widget, desc, *args): # <<<<<<<<<<<<<< * method = desc.get('method') * target = self.get_target(widget, desc) */ - __pyx_t_6 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 576, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 588, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_Widget); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 576, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_Widget); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 588, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_widget, __pyx_t_4) < 0) __PYX_ERR(0, 576, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_widget, __pyx_t_4) < 0) __PYX_ERR(0, 588, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_53methodAction, 0, __pyx_n_s_Blocks_methodAction, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__116)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 576, __pyx_L1_error) + __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_53methodAction, 0, __pyx_n_s_Blocks_methodAction, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__116)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 588, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_CyFunction_SetAnnotationsDict(__pyx_t_4, __pyx_t_6); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_methodAction, __pyx_t_4) < 0) __PYX_ERR(0, 576, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_methodAction, __pyx_t_4) < 0) __PYX_ERR(0, 588, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":597 + /* "kivyblocks/blocks.pyx":609 * alert('%s method not found' % method) * * def widgetBuild(self, desc): # <<<<<<<<<<<<<< * """ * desc format: */ - __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_55widgetBuild, 0, __pyx_n_s_Blocks_widgetBuild, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__118)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 597, __pyx_L1_error) + __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_55widgetBuild, 0, __pyx_n_s_Blocks_widgetBuild, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__118)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 609, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_widgetBuild, __pyx_t_4) < 0) __PYX_ERR(0, 597, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_widgetBuild, __pyx_t_4) < 0) __PYX_ERR(0, 609, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":676 + /* "kivyblocks/blocks.pyx":688 * * @classmethod * def getWidgetById(self, id:str, from_widget:Widget=None) -> Widget: # <<<<<<<<<<<<<< * def find_widget_by_id(id, from_widget): * if id=='self': */ - __pyx_t_4 = __Pyx_PyDict_NewPresized(3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 676, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyDict_NewPresized(3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 688, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_id, __pyx_n_u_str_2) < 0) __PYX_ERR(0, 676, __pyx_L1_error) - __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_Widget); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 676, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_id, __pyx_n_u_str_2) < 0) __PYX_ERR(0, 688, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_Widget); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 688, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_from_widget, __pyx_t_6) < 0) __PYX_ERR(0, 676, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_from_widget, __pyx_t_6) < 0) __PYX_ERR(0, 688, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_Widget); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 676, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_Widget); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 688, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_return, __pyx_t_6) < 0) __PYX_ERR(0, 676, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_return, __pyx_t_6) < 0) __PYX_ERR(0, 688, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __pyx_t_6 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_57getWidgetById, __Pyx_CYFUNCTION_CLASSMETHOD, __pyx_n_s_Blocks_getWidgetById, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__120)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 676, __pyx_L1_error) + __pyx_t_6 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_57getWidgetById, __Pyx_CYFUNCTION_CLASSMETHOD, __pyx_n_s_Blocks_getWidgetById, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__120)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 688, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_CyFunction_SetDefaultsTuple(__pyx_t_6, __pyx_tuple__121); __Pyx_CyFunction_SetAnnotationsDict(__pyx_t_6, __pyx_t_4); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":675 + /* "kivyblocks/blocks.pyx":687 * return doit(desc) * * @classmethod # <<<<<<<<<<<<<< * def getWidgetById(self, id:str, from_widget:Widget=None) -> Widget: * def find_widget_by_id(id, from_widget): */ - __pyx_t_4 = __Pyx_Method_ClassMethod(__pyx_t_6); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 675, __pyx_L1_error) + __pyx_t_4 = __Pyx_Method_ClassMethod(__pyx_t_6); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 687, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_getWidgetById, __pyx_t_4) < 0) __PYX_ERR(0, 676, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_getWidgetById, __pyx_t_4) < 0) __PYX_ERR(0, 688, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":739 + /* "kivyblocks/blocks.pyx":752 * return w * * def on_built(self,v=None): # <<<<<<<<<<<<<< * return * */ - __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_59on_built, 0, __pyx_n_s_Blocks_on_built, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__123)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 739, __pyx_L1_error) + __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_59on_built, 0, __pyx_n_s_Blocks_on_built, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__123)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 752, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_CyFunction_SetDefaultsTuple(__pyx_t_4, __pyx_tuple__124); - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_on_built, __pyx_t_4) < 0) __PYX_ERR(0, 739, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_on_built, __pyx_t_4) < 0) __PYX_ERR(0, 752, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/blocks.pyx":742 + /* "kivyblocks/blocks.pyx":755 * return * * def on_failed(self,e=None): # <<<<<<<<<<<<<< * return * */ - __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_61on_failed, 0, __pyx_n_s_Blocks_on_failed, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__126)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 742, __pyx_L1_error) + __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_10kivyblocks_6blocks_6Blocks_61on_failed, 0, __pyx_n_s_Blocks_on_failed, NULL, __pyx_n_s_kivyblocks_blocks, __pyx_d, ((PyObject *)__pyx_codeobj__126)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 755, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_CyFunction_SetDefaultsTuple(__pyx_t_4, __pyx_tuple__127); - if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_on_failed, __pyx_t_4) < 0) __PYX_ERR(0, 742, __pyx_L1_error) + if (__Pyx_SetNameInClass(__pyx_t_3, __pyx_n_s_on_failed, __pyx_t_4) < 0) __PYX_ERR(0, 755, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; /* "kivyblocks/blocks.pyx":109 @@ -27446,104 +27708,104 @@ if (!__Pyx_RefNanny) { * def __init__(self): * EventDispatcher.__init__(self) */ - __pyx_t_4 = __Pyx_Py3ClassCreate(__pyx_t_2, __pyx_n_s_Blocks, __pyx_t_1, __pyx_t_3, NULL, 0, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 109, __pyx_L1_error) + __pyx_t_4 = __Pyx_Py3ClassCreate(__pyx_t_1, __pyx_n_s_Blocks, __pyx_t_2, __pyx_t_3, NULL, 0, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 109, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); if (PyDict_SetItem(__pyx_d, __pyx_n_s_Blocks, __pyx_t_4) < 0) __PYX_ERR(0, 109, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":745 + /* "kivyblocks/blocks.pyx":758 * return * * Factory.register('Blocks',Blocks) # <<<<<<<<<<<<<< * Factory.register('Video',Video) * Factory.register('OrientationLayout', OrientationLayout) */ - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_Factory); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 745, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_register); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 745, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Factory); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 758, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_Blocks); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 745, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_register); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 758, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 745, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Blocks); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 758, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 758, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_INCREF(__pyx_n_s_Blocks); __Pyx_GIVEREF(__pyx_n_s_Blocks); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_n_s_Blocks); - __Pyx_GIVEREF(__pyx_t_1); - PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_1); - __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 745, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_GIVEREF(__pyx_t_2); + PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_2); + __pyx_t_2 = 0; + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 758, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":746 + /* "kivyblocks/blocks.pyx":759 * * Factory.register('Blocks',Blocks) * Factory.register('Video',Video) # <<<<<<<<<<<<<< * Factory.register('OrientationLayout', OrientationLayout) */ - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_Factory); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 746, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_register); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 746, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_Video); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 746, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 746, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Factory); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 759, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_register); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 759, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_3); + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Video); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 759, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 759, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_n_s_Video); __Pyx_GIVEREF(__pyx_n_s_Video); - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_n_s_Video); - __Pyx_GIVEREF(__pyx_t_1); - PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_1); - __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 746, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); + PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_n_s_Video); + __Pyx_GIVEREF(__pyx_t_2); + PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_t_2); + __pyx_t_2 = 0; + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 759, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "kivyblocks/blocks.pyx":747 + /* "kivyblocks/blocks.pyx":760 * Factory.register('Blocks',Blocks) * Factory.register('Video',Video) * Factory.register('OrientationLayout', OrientationLayout) # <<<<<<<<<<<<<< */ - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_Factory); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 747, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_register); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 747, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_Factory); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 760, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_OrientationLayout); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 747, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_register); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 760, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 747, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_OrientationLayout); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 760, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 760, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_INCREF(__pyx_n_s_OrientationLayout); __Pyx_GIVEREF(__pyx_n_s_OrientationLayout); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_n_s_OrientationLayout); - __Pyx_GIVEREF(__pyx_t_1); - PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_1); - __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 747, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_GIVEREF(__pyx_t_2); + PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_2); + __pyx_t_2 = 0; + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 760, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; /* "kivyblocks/blocks.pyx":1 * import os # <<<<<<<<<<<<<< * import sys * import codecs */ - __pyx_t_1 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_test, __pyx_t_1) < 0) __PYX_ERR(0, 1, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_2 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + if (PyDict_SetItem(__pyx_d, __pyx_n_s_test, __pyx_t_2) < 0) __PYX_ERR(0, 1, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; /*--- Wrapped vars code ---*/ diff --git a/kivyblocks/blocks.pyx b/kivyblocks/blocks.pyx index 7513794..5e86674 100644 --- a/kivyblocks/blocks.pyx +++ b/kivyblocks/blocks.pyx @@ -4,7 +4,6 @@ import codecs import ujson as json from traceback import print_exc -import kivy from functools import partial from appPublic.dictExt import dictExtend @@ -20,6 +19,7 @@ from kivy.metrics import sp,dp,mm from kivy.core.window import WindowBase, Window from kivy.properties import BooleanProperty from kivy.uix.widget import Widget +from kivy.uix.modalview import ModalView from kivy.app import App from kivy.factory import Factory from kivy.uix.video import Video @@ -128,7 +128,6 @@ class Blocks(EventDispatcher): func =partial(blocks.conform_action,widget, desc) return func - def eval(self, s:str, l:dict): g = {} forbidens = [ @@ -413,6 +412,9 @@ class Blocks(EventDispatcher): p.update(d) opts['options'] = p def doit(target:Widget, add_mode:str, o, w:Widget): + if isinstance(w, ModalView): + return + if target: if add_mode == 'replace': target.clear_widgets() @@ -429,6 +431,10 @@ class Blocks(EventDispatcher): b.widgetBuild(opts) def urlwidgetAction(self, widget:Widget, desc, *args): + Logger.info('Block: urlwidgetAction() called, desc=%s, args=%s', \ + str(desc), + args + ) target = self.get_target(widget, desc) add_mode = desc.get('mode','replace') opts = desc.get('options').copy() @@ -445,6 +451,9 @@ class Blocks(EventDispatcher): } def doit(target:Widget, add_mode:str, o, w:Widget): + if isinstance(w, ModalView): + return + if target: if add_mode == 'replace': target.clear_widgets() @@ -459,13 +468,18 @@ class Blocks(EventDispatcher): b.bind(on_failed=doerr) b.widgetBuild(d) - def getActionData(self, widget:Widget, desc,*args): + def getActionData(self, widget:Widget, desc, *args): + Logger.info('Block: getActionData(): desc=%s args=%s' + ,str(desc), args) + data = {} rtdesc = self.build_rtdesc(desc) - rt = self.get_rtdata(widget, rtdesc, *args) - data.update(rt) - if desc.get('keymapping'): - data = keyMapping(data, desc.get('keymapping')) + if rtdesc: + rt = self.get_rtdata(widget, rtdesc, *args) + if rt: + data.update(rt) + if desc.get('keymapping'): + data = keyMapping(data, desc.get('keymapping')) return data def registedfunctionAction(self, widget:Widget, desc, *args): @@ -516,8 +530,6 @@ class Blocks(EventDispatcher): else: rtdesc['method'] = desc.get('datamethod', 'getValue') rtdesc['kwargs'] = desc.get('datakwargs', {}) - else: - return {} return rtdesc def get_rtdata(self, widget:Widget, desc, *args): @@ -730,6 +742,7 @@ class Blocks(EventDispatcher): and Window.fullscreen == True \ and app.root != app.fs_widget: w = find_widget_by_id(id, app.fs_widget) + if w is None: print(id, 'not found ....') return None diff --git a/kivyblocks/clickable.py b/kivyblocks/clickable.py index 093eb45..17519bf 100644 --- a/kivyblocks/clickable.py +++ b/kivyblocks/clickable.py @@ -91,12 +91,14 @@ class ClickableIconText(ClickableText): SUPER(ClickableIconText, self, kw) def on_source(self, o, source): + if source is None: + source = blockIamge('broken.png') + if self.img_w: - if source is None: - source = blockIamge('broken.png') self.img_w.source = source return - self.img_w = AsyncImage(source=self.source, **self.img_kw) + + self.img_w = AsyncImage(source=source, **self.img_kw) self.add_widget(self.img_w, index=len(self.children)) class ToggleText(ClickableText): diff --git a/kivyblocks/command_action.py b/kivyblocks/command_action.py new file mode 100644 index 0000000..812f77c --- /dev/null +++ b/kivyblocks/command_action.py @@ -0,0 +1,56 @@ + +from functools import partial +from kivy.logger import Logger +from kivy.factory import Factory + +def get_cmd_desc(cmd_desc): + desc = { + } + v = cmd_desc + desc['target'] = v.get('target') + if v.get('datawidget'): + desc['datawidget'] = v.get('datawidget') + if v.get('datamethod'): + desc['datamethod'] = v['datamethod'] + keys = v.keys() + if 'url' in keys: + desc['actiontype'] = 'urlwidget' + desc['mode'] = 'replace' + options = { + 'params':v.get('params',{}), + 'url':v.get('url') + } + desc['options'] = options + return desc + if 'rfname' in keys: + desc['actiontype'] = 'registedfunction' + desc['params'] = v.get('params',{}) + return desc + if 'script' in keys: + desc['actiontype'] = 'script' + desc['script'] = v.get('script') + return desc + if 'method' in keys: + desc['actiontype'] = 'method' + desc['method'] = v.get('method') + return desc + if 'actions' in keys: + desc['actiontype'] = 'multiple' + desc['actions'] = v.get('actions') + return desc + return None + +def cmd_action(cmd_desc, widget): + desc = get_cmd_desc(cmd_desc) + if desc is None: + Logger.error('CommandAction: cmd_desc=%s error') + return + blocks = Factory.Blocks() + if 'conform' in cmd_desc: + options = cmd_desc['conform'] + w = Factory.Conform(**options) + f = partial(blocks.uniaction, widget, desc) + w.bind(on_conform=f) + return + blocks.uniaction(widget, desc) + diff --git a/kivyblocks/dg.c b/kivyblocks/dg.c index 6169a5f..35deb30 100644 --- a/kivyblocks/dg.c +++ b/kivyblocks/dg.c @@ -17152,6 +17152,7 @@ static PyObject *__pyx_pw_10kivyblocks_2dg_8DataGrid_65get_selected_data(PyObjec static PyObject *__pyx_pf_10kivyblocks_2dg_8DataGrid_64get_selected_data(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_self) { PyObject *__pyx_v_data = NULL; + PyObject *__pyx_v_row_id = NULL; PyObject *__pyx_v_row = NULL; PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations @@ -17160,7 +17161,6 @@ static PyObject *__pyx_pf_10kivyblocks_2dg_8DataGrid_64get_selected_data(CYTHON_ int __pyx_t_3; PyObject *__pyx_t_4 = NULL; PyObject *__pyx_t_5 = NULL; - PyObject *__pyx_t_6 = NULL; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; @@ -17185,7 +17185,7 @@ static PyObject *__pyx_pf_10kivyblocks_2dg_8DataGrid_64get_selected_data(CYTHON_ * if not self.selected_rowid: * return {} # <<<<<<<<<<<<<< * data = {} - * if self.freeze_part: + * row_id = self.selected_rowid */ __Pyx_XDECREF(__pyx_r); __pyx_t_1 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 605, __pyx_L1_error) @@ -17207,8 +17207,8 @@ static PyObject *__pyx_pf_10kivyblocks_2dg_8DataGrid_64get_selected_data(CYTHON_ * if not self.selected_rowid: * return {} * data = {} # <<<<<<<<<<<<<< + * row_id = self.selected_rowid * if self.freeze_part: - * row = self.freeze_part.body.get_row_by_id(row_id) */ __pyx_t_1 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 606, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); @@ -17218,122 +17218,140 @@ static PyObject *__pyx_pf_10kivyblocks_2dg_8DataGrid_64get_selected_data(CYTHON_ /* "kivyblocks/dg.pyx":607 * return {} * data = {} + * row_id = self.selected_rowid # <<<<<<<<<<<<<< + * if self.freeze_part: + * row = self.freeze_part.body.get_row_by_id(row_id) + */ + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_selected_rowid); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 607, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + __pyx_v_row_id = __pyx_t_1; + __pyx_t_1 = 0; + + /* "kivyblocks/dg.pyx":608 + * data = {} + * row_id = self.selected_rowid * if self.freeze_part: # <<<<<<<<<<<<<< * row = self.freeze_part.body.get_row_by_id(row_id) * data.update(row.row_data) */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_freeze_part); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 607, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_freeze_part); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 608, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 607, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 608, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; if (__pyx_t_3) { - /* "kivyblocks/dg.pyx":608 - * data = {} + /* "kivyblocks/dg.pyx":609 + * row_id = self.selected_rowid * if self.freeze_part: * row = self.freeze_part.body.get_row_by_id(row_id) # <<<<<<<<<<<<<< * data.update(row.row_data) * row = self.normal_part.body.get_row_by_id(row_id) */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_freeze_part); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 608, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_freeze_part); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 609, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_body); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 608, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_body); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 609, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_get_row_by_id); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 608, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_get_row_by_id); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 609, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_row_id); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 608, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); - __pyx_t_6 = NULL; + __pyx_t_5 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_4))) { - __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_4); - if (likely(__pyx_t_6)) { + __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_4); + if (likely(__pyx_t_5)) { PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_4); - __Pyx_INCREF(__pyx_t_6); + __Pyx_INCREF(__pyx_t_5); __Pyx_INCREF(function); __Pyx_DECREF_SET(__pyx_t_4, function); } } - __pyx_t_1 = (__pyx_t_6) ? __Pyx_PyObject_Call2Args(__pyx_t_4, __pyx_t_6, __pyx_t_5) : __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_5); - __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 608, __pyx_L1_error) + __pyx_t_1 = (__pyx_t_5) ? __Pyx_PyObject_Call2Args(__pyx_t_4, __pyx_t_5, __pyx_v_row_id) : __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_v_row_id); + __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 609, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __pyx_v_row = __pyx_t_1; __pyx_t_1 = 0; - /* "kivyblocks/dg.pyx":609 + /* "kivyblocks/dg.pyx":610 * if self.freeze_part: * row = self.freeze_part.body.get_row_by_id(row_id) * data.update(row.row_data) # <<<<<<<<<<<<<< * row = self.normal_part.body.get_row_by_id(row_id) * data.update(row.row_data) */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_row, __pyx_n_s_row_data); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 609, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_row, __pyx_n_s_row_data); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 610, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_4 = __Pyx_CallUnboundCMethod1(&__pyx_umethod_PyDict_Type_update, __pyx_v_data, __pyx_t_1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 609, __pyx_L1_error) + __pyx_t_4 = __Pyx_CallUnboundCMethod1(&__pyx_umethod_PyDict_Type_update, __pyx_v_data, __pyx_t_1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 610, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/dg.pyx":607 - * return {} + /* "kivyblocks/dg.pyx":608 * data = {} + * row_id = self.selected_rowid * if self.freeze_part: # <<<<<<<<<<<<<< * row = self.freeze_part.body.get_row_by_id(row_id) * data.update(row.row_data) */ } - /* "kivyblocks/dg.pyx":610 + /* "kivyblocks/dg.pyx":611 * row = self.freeze_part.body.get_row_by_id(row_id) * data.update(row.row_data) * row = self.normal_part.body.get_row_by_id(row_id) # <<<<<<<<<<<<<< * data.update(row.row_data) + * return data */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_normal_part); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 610, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_self, __pyx_n_s_normal_part); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 611, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_body); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 610, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_body); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 611, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_get_row_by_id); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 610, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_get_row_by_id); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 611, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_row_id); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 610, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); - __pyx_t_6 = NULL; + __pyx_t_5 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_1))) { - __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_1); - if (likely(__pyx_t_6)) { + __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_1); + if (likely(__pyx_t_5)) { PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_1); - __Pyx_INCREF(__pyx_t_6); + __Pyx_INCREF(__pyx_t_5); __Pyx_INCREF(function); __Pyx_DECREF_SET(__pyx_t_1, function); } } - __pyx_t_4 = (__pyx_t_6) ? __Pyx_PyObject_Call2Args(__pyx_t_1, __pyx_t_6, __pyx_t_5) : __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_t_5); - __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 610, __pyx_L1_error) + __pyx_t_4 = (__pyx_t_5) ? __Pyx_PyObject_Call2Args(__pyx_t_1, __pyx_t_5, __pyx_v_row_id) : __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_v_row_id); + __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; + if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 611, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_XDECREF_SET(__pyx_v_row, __pyx_t_4); __pyx_t_4 = 0; - /* "kivyblocks/dg.pyx":611 + /* "kivyblocks/dg.pyx":612 * data.update(row.row_data) * row = self.normal_part.body.get_row_by_id(row_id) * data.update(row.row_data) # <<<<<<<<<<<<<< + * return data */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_row, __pyx_n_s_row_data); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 611, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_row, __pyx_n_s_row_data); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 612, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_1 = __Pyx_CallUnboundCMethod1(&__pyx_umethod_PyDict_Type_update, __pyx_v_data, __pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 611, __pyx_L1_error) + __pyx_t_1 = __Pyx_CallUnboundCMethod1(&__pyx_umethod_PyDict_Type_update, __pyx_v_data, __pyx_t_4); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 612, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + /* "kivyblocks/dg.pyx":613 + * row = self.normal_part.body.get_row_by_id(row_id) + * data.update(row.row_data) + * return data # <<<<<<<<<<<<<< + */ + __Pyx_XDECREF(__pyx_r); + __Pyx_INCREF(__pyx_v_data); + __pyx_r = __pyx_v_data; + goto __pyx_L0; + /* "kivyblocks/dg.pyx":603 * return fs * @@ -17343,17 +17361,15 @@ static PyObject *__pyx_pf_10kivyblocks_2dg_8DataGrid_64get_selected_data(CYTHON_ */ /* function exit code */ - __pyx_r = Py_None; __Pyx_INCREF(Py_None); - goto __pyx_L0; __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); __Pyx_XDECREF(__pyx_t_4); __Pyx_XDECREF(__pyx_t_5); - __Pyx_XDECREF(__pyx_t_6); __Pyx_AddTraceback("kivyblocks.dg.DataGrid.get_selected_data", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __pyx_L0:; __Pyx_XDECREF(__pyx_v_data); + __Pyx_XDECREF(__pyx_v_row_id); __Pyx_XDECREF(__pyx_v_row); __Pyx_XGIVEREF(__pyx_r); __Pyx_RefNannyFinishContext(); @@ -18703,10 +18719,10 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { * if not self.selected_rowid: * return {} */ - __pyx_tuple__129 = PyTuple_Pack(3, __pyx_n_s_self, __pyx_n_s_data, __pyx_n_s_row); if (unlikely(!__pyx_tuple__129)) __PYX_ERR(0, 603, __pyx_L1_error) + __pyx_tuple__129 = PyTuple_Pack(4, __pyx_n_s_self, __pyx_n_s_data, __pyx_n_s_row_id, __pyx_n_s_row); if (unlikely(!__pyx_tuple__129)) __PYX_ERR(0, 603, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__129); __Pyx_GIVEREF(__pyx_tuple__129); - __pyx_codeobj__130 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__129, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_dg_pyx, __pyx_n_s_get_selected_data, 603, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__130)) __PYX_ERR(0, 603, __pyx_L1_error) + __pyx_codeobj__130 = (PyObject*)__Pyx_PyCode_New(1, 0, 4, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__129, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_kivyblocks_dg_pyx, __pyx_n_s_get_selected_data, 603, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__130)) __PYX_ERR(0, 603, __pyx_L1_error) __Pyx_RefNannyFinishContext(); return 0; __pyx_L1_error:; diff --git a/kivyblocks/dg.pyx b/kivyblocks/dg.pyx index 0fedf6e..25ed58c 100644 --- a/kivyblocks/dg.pyx +++ b/kivyblocks/dg.pyx @@ -604,8 +604,10 @@ class DataGrid(VBox): if not self.selected_rowid: return {} data = {} + row_id = self.selected_rowid if self.freeze_part: row = self.freeze_part.body.get_row_by_id(row_id) data.update(row.row_data) row = self.normal_part.body.get_row_by_id(row_id) data.update(row.row_data) + return data diff --git a/kivyblocks/message.py b/kivyblocks/message.py index 0815668..2173684 100644 --- a/kivyblocks/message.py +++ b/kivyblocks/message.py @@ -1,29 +1,60 @@ from kivy.factory import Factory +from kivy.properties import StringProperty, NumericProperty from kivy.uix.image import AsyncImage from .utils import * from .baseWidget import Modal, Text, HBox,VBox +from .widget_css import register_css +from .clickable import ClickableIconText from .toggleitems import PressableBox +conform_default_title_css = { + "bgcolor":[0.88,0.88,0.88,1], + "fgcolor":[0.12,0.12,0.12,1] +} +conform_default_body_css = { + "bgcolor":[0.92,0.92,0.92,1], + "fgcolor":[0.16,0.16,0.16,1] +} + +conform_button_default_css = { + "bgcolor":[0.05,0.85,0.05,1], + "fgcolor":[0.95,0.95,0.95,1] +} + +cancel_button_default_css = { + "bgcolor":[0.85, 0.5, 0.5, 1], + "fgcolor":[0.9, 0.90, 0.9, 1] +} + +register_css('conform_default_title_css', conform_default_title_css) +register_css('conform_default_body_css', conform_default_body_css) +register_css('conform_button_default_css', conform_button_default_css) +register_css('cancel_button_default_css', cancel_button_default_css) + class Conform(Modal): - def __init__(self, title_icon=None, - title = None, - message = None, - conform_icon=None, - cancel_icon=None, - **kw): - Modal.__init__(self, **kw) + title = StringProperty(None) + title_icon = StringProperty(None) + message = StringProperty(None) + conform_icon = StringProperty(None) + cancel_icon = StringProperty(None) + title_css = StringProperty('conform_default_title_css') + body_css = StringProperty('conform_default_body_css') + conform_css = StringProperty('conform_button_default_css') + cancel_css = StringProperty('cancel_button_default_css') + def __init__(self, **kw): + super(Conform, self).__init__(**kw) self.register_event_type('on_cancel') self.register_event_type('on_conform') self.auto_dismiss = False - b = VBox() - b1 = HBox(size_hint_y=None, height=CSize(1.4)) - b1.add_widget(AsyncImage(source=title_icon or \ + b = VBox(csscls=self.title_css) + b1 = HBox(size_hint_y=None, height=CSize(2)) + b1.add_widget(AsyncImage(source=self.title_icon or \ blockImage('question.png'), size_hint=[None,None], height=CSize(1.2), width=CSize(1.2))) - b1.add_widget(Text(text=title or 'Conform', + b1.add_widget(Text(otext=self.title or 'Conform', font_size=CSize(1.2), i18n=True, wrap=True, @@ -31,75 +62,43 @@ class Conform(Modal): valign='center', )) b.add_widget(b1) - b2 = HBox() + b2 = HBox(csscls=self.body_css) - b2.add_widget(Text(text=message or 'Please conform', + b2.add_widget(Text(text=self.message or 'Please conform', + i18n=True, wrap=True, halign='left', size_hint=(1,1), font_size=CSize(1))) b.add_widget(b2) - b3 = HBox(size_hint_y=None, height=CSize(2)) - w_cancel = PressableBox() - blocks = Factory.Blocks() - w_cancel.add_widget(blocks.widgetBuild({ - "widgettype":"HBox", - "options":{}, - "subwidgets":[ - { - "widgettype":"AsyncImage", - "options":{ - "source":cancel_icon or blockImage('cancel.png'), - "size_hint":[None,None], - "height":CSize(1), - "width":CSize(1) - } - }, - { - "widgettype":"Text", - "options":{ - "text":'Cancel', - "wrap":True, - "font_size":CSize(1), - "halign":'left', - "i18n":True - } - } - ] - })) - w_conform = PressableBox() - blocks = Factory.Blocks() - w_conform.add_widget(blocks.widgetBuild({ - "widgettype":"HBox", - "options":{}, - "subwidgets":[ - { - "widgettype":"AsyncImage", - "options":{ - "source":conform_icon or blockImage('conform.png'), - "size_hint":[None,None], - "height":CSize(1), - "width":CSize(1) - } - }, - { - "widgettype":"Text", - "options":{ - "text":'Conform', - "wrap":True, - "font_size":CSize(1), - "halign":'left', - "i18n":True - } - } - ] - })) - + b3 = HBox(size_hint_y=None, + height=CSize(2), + csscls=self.body_css) + w_cancel = ClickableIconText(text='Cancel', + source=self.cancel_icon or + blockImage('cancel.png'), + img_kw={ + "size_hint":[None, None], + "height":CSize(1), + "width":CSize(1) + }, + csscls=self.cancel_css + ) + w_conform = ClickableIconText(text='Conform', + source=self.conform_icon or + blockImage('question.png'), + img_kw={ + "size_hint":[None, None], + "height":CSize(1), + "width":CSize(1) + }, + csscls=self.conform_css + ) w_cancel.bind(on_press=self.cancel_press) w_conform.bind(on_press=self.conform_press) - b3.add_widget(w_cancel) b3.add_widget(w_conform) + b3.add_widget(w_cancel) b.add_widget(b3) self.add_widget(b) diff --git a/kivyblocks/toolbar.py b/kivyblocks/toolbar.py index 4ba8214..208d1cf 100644 --- a/kivyblocks/toolbar.py +++ b/kivyblocks/toolbar.py @@ -22,7 +22,7 @@ from .ready import WidgetReady from .color_definitions import getColors from .baseWidget import Text, Box from .scrollpanel import ScrollPanel -from .toggleitems import ToggleItems +from .command_action import cmd_action class Toolbar(ScrollPanel): """ @@ -191,30 +191,11 @@ class Toolbar(ScrollPanel): self.dispatch('on_press', ret_v) return - blocks = Factory.Blocks() - desc = { - } - v = self.w_dic[o] - desc['target'] = v.get('target', self.target) - if v.get('datatarget'): - desc['datatarget'] = v.get('datatarget') - if v.get('datamethod'): - desc['datamethod'] = v['datamethod'] - keys = v.keys() - if 'url' in keys: - desc['mode'] = 'replace' - options = { - 'params':v.get('params',{}), - 'url':v.get('url') - } - desc['options'] = options - Factory.Blocks().urlwidgetAction(self, desc) - if 'rfname' in keys: - desc['params'] = v.get('params',{}) - Factory.Blocks().registedfunctionAction(self, desc) - if 'script' in keys: - desc['script'] = v.get('script') - Factory.Blocks().scriptAction(self, desc) + desc = self.w_dic[o].copy() + if not desc.get('target'): + desc['target'] = self.target + + cmd_action(desc, self) class ToolPage(Box): """