diff options
| author | LV-426 <lv-426@taproot.org.il> | 2015-05-04 03:37:39 +0300 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2015-05-05 19:04:32 +0300 |
| commit | 713e75e5af0275aa437718f64a4a0be9e17cce58 (patch) | |
| tree | faad0bfd6ab123bd9e042f4bee0bd1a794b81807 | |
| parent | 46a6618cb653533a9776520b6b2428728223cc80 (diff) | |
use valid python attr name: template.d_path -> template_d_path
| -rw-r--r-- | res/etc/rhizi-server.conf.example | 2 | ||||
| -rw-r--r-- | res/rz-mux/rhizi-conf-template.d/rhizi-server.conf.jinja | 2 | ||||
| -rw-r--r-- | src/server/rz_server.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/res/etc/rhizi-server.conf.example b/res/etc/rhizi-server.conf.example index 09eb9b7f..e18c72d0 100644 --- a/res/etc/rhizi-server.conf.example +++ b/res/etc/rhizi-server.conf.example @@ -8,7 +8,7 @@ # General # #root_path = -#template.d_path +#template_d_path development_mode = True static_url_path = /static diff --git a/res/rz-mux/rhizi-conf-template.d/rhizi-server.conf.jinja b/res/rz-mux/rhizi-conf-template.d/rhizi-server.conf.jinja index f6a234cd..77c25dcb 100644 --- a/res/rz-mux/rhizi-conf-template.d/rhizi-server.conf.jinja +++ b/res/rz-mux/rhizi-conf-template.d/rhizi-server.conf.jinja @@ -8,7 +8,7 @@ # General # root_path = {{ root_path }} -template.d_path = {{ template_d_path }} +template_d_path = {{ template_d_path }} development_mode = True static_url_path = /static diff --git a/src/server/rz_server.py b/src/server/rz_server.py index 756eb1d9..8f06efd1 100644 --- a/src/server/rz_server.py +++ b/src/server/rz_server.py @@ -50,7 +50,7 @@ class Config(object): cfg['development_mode'] = False cfg['root_path'] = os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) - cfg['template.d_path'] = os.path.join(cfg['root_path'], 'template.d') + cfg['template_d_path'] = os.path.join(cfg['root_path'], 'template.d') cfg['user_db_path'] = './user_db.db' @@ -414,7 +414,7 @@ def init_webapp(cfg, kernel): # webapp = FlaskExt(__name__, static_folder='static', - template_folder=cfg.template_folder, + template_folder=cfg.template_d_path, static_url_path=cfg.static_url_path) webapp.config.from_object(cfg) webapp.root_path = root_path # for some reason calling config.from_xxx() does not have effect |