build

2 files changed, 6 insertions, 6 deletions

diff --git a/megapixels/app/builder/builder.py b/megapixels/app/builder/builder.py
index d1f882d6..cb5d8fe9 100644
--- a/megapixels/app/builder/builder.py
+++ b/megapixels/app/builder/builder.py
@@ -6,8 +6,8 @@ from jinja2 import Environment, FileSystemLoader, select_autoescape
 
 import app.settings.app_cfg as cfg
 
-import app.builder.s3
-import app.builder.parser
+import app.builder.s3 as s3
+import app.builder.parser as parser
 
 env = Environment(
   loader=FileSystemLoader(cfg.DIR_SITE_TEMPLATES),
diff --git a/megapixels/app/builder/parser.py b/megapixels/app/builder/parser.py
index ea84f658..985111ac 100644
--- a/megapixels/app/builder/parser.py
+++ b/megapixels/app/builder/parser.py
@@ -3,8 +3,8 @@ import re
 import glob
 import mistune
 
-import app.settings.app_cfg
-import app.builder.s3
+import app.settings.app_cfg as cfg
+import app.builder.s3 as s3
 
 renderer = mistune.Renderer(escape=False)
 markdown = mistune.Markdown(renderer=renderer)
@@ -70,7 +70,7 @@ def parse_markdown(sections, s3_path, skip_h1=False):
 def parse_research_index(research_posts):
   content = "<div class='research_index'>"
   for post in research_posts:
-    s3_path = s3.make_s3_path(app_cfg.S3_SITE_PATH, post['path'])
+    s3_path = s3.make_s3_path(cfg.S3_SITE_PATH, post['path'])
     if 'image' in post:
       post_image = s3_path + post['image']
     else:
@@ -134,7 +134,7 @@ def parse_metadata(fn, sections):
     if key not in metadata:
       metadata[key] = default_metadata[key]
 
-  basedir = os.path.dirname(fn.replace(content_path, ''))
+  basedir = os.path.dirname(fn.replace(cfg.DIR_SITE_CONTENT, ''))
   basename = os.path.basename(fn)
   if basedir == '/':
     metadata['path'] = '/'