From 58a79e26026971fe766f4e215afad4c04fbc80b1 Mon Sep 17 00:00:00 2001 From: yumoqing Date: Wed, 14 Sep 2022 10:08:50 +0800 Subject: [PATCH] bugfix --- kivyblocks/blocks.py | 5 +---- kivyblocks/script.py | 6 ++++-- kivyblocks/version.py | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/kivyblocks/blocks.py b/kivyblocks/blocks.py index 7a7fa4a..7195aac 100755 --- a/kivyblocks/blocks.py +++ b/kivyblocks/blocks.py @@ -110,10 +110,7 @@ class Blocks(EventDispatcher): self.register_event_type('on_failed') self.env = GlobalEnv() config = getConfig() - if config.script_root: - self.script = Script(config.script_root) - else: - self.script = Script(config.workdir) + self.script = Script() def set(self, k:str, v): self.env[k] = v diff --git a/kivyblocks/script.py b/kivyblocks/script.py index 6525fdb..a49c2a5 100644 --- a/kivyblocks/script.py +++ b/kivyblocks/script.py @@ -23,8 +23,10 @@ def set_script_env(n,v): env.update({n:v}) class Script: - def __init__(self, root): - self.root = root + def __init__(self): + config = getConfig() + self.root = config.script_root + print('Script.root=', self.root) self.env = {} self.handlers = {} self.register('.tmpl', TemplateHandler) diff --git a/kivyblocks/version.py b/kivyblocks/version.py index 6a49b24..7414642 100644 --- a/kivyblocks/version.py +++ b/kivyblocks/version.py @@ -1 +1 @@ -__version__ = '0.3.9' +__version__ = '0.3.10'