merge upstream

pelican/settings.py

@@ -68,7 +68,9 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'ARTICLE_PERMALINK_STRUCTURE': '',
                    'TYPOGRIFY': False,
                    'LESS_GENERATOR': False,
-                   'SUMARY_MAX_LENGTH': 50,
+                   'SUMMARY_MAX_LENGTH': 50,
+                   'WEBASSETS': False,
+                   'PLUGINS': [],
                    }
 
 
@@ -151,4 +153,12 @@ def configure_settings(settings, default_settings=None, filename=None):
                  "http://docs.notmyidea.org/alexis/pelican/settings.html#timezone "
                  "for more information")
 
+    if 'WEBASSETS' in settings and settings['WEBASSETS'] is not False:
+        try:
+            from webassets.ext.jinja2 import AssetsExtension
+            settings['JINJA_EXTENSIONS'].append(AssetsExtension)
+        except ImportError:
+            logger.warn("You must install the webassets module to use WEBASSETS.")
+            settings['WEBASSETS'] = False
+
     return settings