From 3376cd5400a0dfda3d6222bf07ccc375adf7af1b Mon Sep 17 00:00:00 2001 From: Alexis Metaireau Date: Wed, 18 Aug 2010 15:08:35 +0200 Subject: [PATCH] Add a settings file. --- TODO | 1 - pelican/generator.py | 13 +++++-------- pelican/themes/archives.html | 2 +- pelican/themes/base.html | 4 ++-- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/TODO b/TODO index 2aebb277..55456ea9 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,3 @@ -* Add a settings.py file/option * Fall back to settings + date of files when no metadata available * Filter to generate only the files with .rst extension * Add a licence diff --git a/pelican/generator.py b/pelican/generator.py index bf723fd4..69a85e44 100644 --- a/pelican/generator.py +++ b/pelican/generator.py @@ -103,17 +103,14 @@ def update_dict(mapping, key, value): def read_settings(context, filename): - """Load a Python file into a dictionary. + """Load a Python file into a dictionary. """ if filename: - from importlib import import_module - d = import_module(filename) - - for key in dir(d): + tempdict = {} + execfile(filename, tempdict) + for key in tempdict: if key.isupper(): - context[key] = getattr(d, key) - from ipdb import set_trace - set_trace() + context[key] = tempdict[key] return context _METADATA = re.compile('.. ([a-z]+): (.*)', re.M) diff --git a/pelican/themes/archives.html b/pelican/themes/archives.html index 19da15ff..f2f6270b 100644 --- a/pelican/themes/archives.html +++ b/pelican/themes/archives.html @@ -1,6 +1,6 @@ {% extends "base.html" %} {% block content %} -

Archives for {{ blogname }}

+

Archives for {{ BLOGNAME }}

{% for date, articles in dates %} diff --git a/pelican/themes/base.html b/pelican/themes/base.html index aff8af18..fcc0a07d 100644 --- a/pelican/themes/base.html +++ b/pelican/themes/base.html @@ -1,13 +1,13 @@ - {% block title %}{{ blogtitle }}{%endblock%} + {% block title %}{{ BLOGNAME }}{%endblock%} {% block content %} {% endblock %}