From e6448567a0a98d9c005c1ab955c45a657b814428 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 11 May 2012 22:19:03 +0200 Subject: [PATCH] add some doc in the code --- pelican/__init__.py | 6 ++++-- pelican/generators.py | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pelican/__init__.py b/pelican/__init__.py index 97e21ccd..7e546b29 100644 --- a/pelican/__init__.py +++ b/pelican/__init__.py @@ -126,8 +126,10 @@ class Pelican(object): writer = self.get_writer() - generators[1].env.assets_environment = generators[0].assets_env - generators[2].env.assets_environment = generators[0].assets_env + # pass the assets environment to the generators + if self.settings['WEBASSETS']: + generators[1].env.assets_environment = generators[0].assets_env + generators[2].env.assets_environment = generators[0].assets_env for p in generators: if hasattr(p, 'generate_output'): diff --git a/pelican/generators.py b/pelican/generators.py index 30a463b4..f15db15d 100644 --- a/pelican/generators.py +++ b/pelican/generators.py @@ -394,6 +394,9 @@ class StaticGenerator(Generator): if self.settings['WEBASSETS']: from webassets import Environment as AssetsEnvironment + # Define the assets environment that will be passed to the + # generators. The StaticGenerator must then be run first to have + # the assets in the output_path before generating the templates. assets_url = self.settings['SITEURL'] + '/theme/' assets_src = os.path.join(self.output_path, 'theme') self.assets_env = AssetsEnvironment(assets_src, assets_url)