Moves static definition of "blog" out of the main config.

EnigmaCurry · Feb 6, 2011 · 6b9798d · 6b9798d
1 parent 34f27be
commit 6b9798d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/blogofile/config.py b/blogofile/config.py
@@ -51,9 +51,6 @@ def recompile():
         else:
             #p could just be a pre-compiled regex
             site.compiled_file_ignore_patterns.append(p)
-    import urlparse
-    global blog
-    blog.url = urlparse.urljoin(site.url, blog.path)
 
 def __load_config(path=None):
     #Strategy:

diff --git a/blogofile/site_init/blog_features/_controllers/blog/__init__.py b/blogofile/site_init/blog_features/_controllers/blog/__init__.py
@@ -1,4 +1,5 @@
 import logging
+import urlparse
 from mako.lookup import TemplateLookup
 
 from blogofile.cache import bf
@@ -102,6 +103,7 @@ def materialize_template(template_name, location, attrs={}, lookup=None):
     bf.writer.materialize_template(template_name, location, attrs, lookup)
 
 def init():
+    config["url"] = urlparse.urljoin(bf.config.site.url, config["path"])
     global template_lookup
     template_lookup = TemplateLookup(
         directories=[config["template_path"],"_templates"],
@@ -126,7 +128,7 @@ def run():
     categories.sort_into_categories()
 
     blog.logger = logging.getLogger(config['name'])
-    
+
     permapage.run()
     chronological.run()
     archives.run()