Rename setup method to initilise

zookeepr · Sep 4, 2015 · 982989f · 982989f
1 parent 15122b8
commit 982989f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/zkpylons/config/environment.py b/zkpylons/config/environment.py
@@ -13,7 +13,7 @@
 from zkpylons.model import init_model
 from zkpylons.model.config import Config
 
-from zkpylons.config.zkpylons_config import get_file_paths
+from zkpylons.config.zkpylons_config import initialise_file_paths
 
 from pylons.configuration import PylonsConfig
 
@@ -27,7 +27,7 @@ def load_environment(global_conf, app_conf):
     engine = sqlalchemy.create_engine(app_conf['sqlalchemy.url'])
     init_model(engine)
 
-    file_paths = get_file_paths()
+    file_paths = initialise_file_paths()
 
     # Pylons paths
     root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))

diff --git a/zkpylons/config/zkpylons_config.py b/zkpylons/config/zkpylons_config.py
@@ -48,7 +48,7 @@ def expand_variable(value):
     file_paths[k] = expand_variable(file_paths[k])
 
 
-def get_file_paths():
+def initialise_file_paths():
     # Should be called after db is initialised
     if 'enabled_theme' not in file_paths:
         enabled_theme = Config.get('theme')
@@ -59,4 +59,4 @@ def get_file_paths():
 
 
 def get_path(key):
-    return get_file_paths()[key]
+    return initialise_file_paths()[key]