Added os.path.join() to a few filesystem related string operations.

diff --git a/bin/misc.py b/bin/misc.py
index a58d5be..289ea6b 100644 (file)
--- a/bin/misc.py
+++ b/bin/misc.py
@@ -44,7 +44,8 @@ def strip_page_metadata(content):
 
 def lookup_current_metadata(key):
     """Wrapper for lookup_file_metadata() supplying the current REQUEST_URI as 'file'."""
 
 def lookup_current_metadata(key):
     """Wrapper for lookup_file_metadata() supplying the current REQUEST_URI as 'file'."""

-    file = config.site_data_prefix + os.environ['REQUEST_URI'] + config.markup_file_extension
+    file = os.path.join(config.site_data_prefix + os.environ['REQUEST_URI'] +
+            config.markup_file_extension)

     return lookup_file_metadata(key,file)
 
 def lookup_file_metadata(key,file):
     return lookup_file_metadata(key,file)
 
 def lookup_file_metadata(key,file):

diff --git a/bin/template.py b/bin/template.py
index 5950cdf..b2c16f9 100644 (file)
--- a/bin/template.py
+++ b/bin/template.py
@@ -88,8 +88,8 @@ def site_title(template):
 
 def body(template):
     keyword = add_delimiter("page_content")
 
 def body(template):
     keyword = add_delimiter("page_content")

-    body = misc.load_file(config.site_data_prefix + os.environ['REQUEST_URI'] +
-            config.markup_file_extension)
+    body = misc.load_file(os.path.join(config.site_data_prefix +
+            os.environ['REQUEST_URI'] + config.markup_file_extension))

     body = misc.strip_page_metadata(body)
     body = misc.process_markup(body)
     return template.replace(keyword, body)
     body = misc.strip_page_metadata(body)
     body = misc.process_markup(body)
     return template.replace(keyword, body)