From fafb94d2d7673e4fade6058310f327beaeec927f Mon Sep 17 00:00:00 2001 From: Aaron Taylor Date: Mon, 8 Jan 2018 19:44:41 -0800 Subject: [PATCH] Added os.path.join() to a few filesystem related string operations. --- bin/misc.py | 3 ++- bin/template.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/misc.py b/bin/misc.py index a58d5be..289ea6b 100644 --- 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'.""" - 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): diff --git a/bin/template.py b/bin/template.py index 5950cdf..b2c16f9 100644 --- a/bin/template.py +++ b/bin/template.py @@ -88,8 +88,8 @@ def site_title(template): 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) -- 2.20.1