From 898ac3808f933e33f458822bb77e3f28d0623fc0 Mon Sep 17 00:00:00 2001 From: Pavel Puchkin Date: Fri, 20 Apr 2012 11:28:00 +1100 Subject: [PATCH] Last fix? --- pelican/contents.py | 9 +++++---- pelican/writers.py | 6 +++++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pelican/contents.py b/pelican/contents.py index 506c4c02..ba374ba1 100644 --- a/pelican/contents.py +++ b/pelican/contents.py @@ -184,10 +184,11 @@ class URLWrapper(object): def _from_settings(self, key): setting = "%s_%s" % (self.__class__.__name__.upper(), key) value = self.settings[setting] - value = value is not False and value or '' # change to '' only False - if value == '': - logger.warning(u'%s is disabled' % setting) - return unicode(value).format(**self.as_dict()) + if not isinstance(value, (str, unicode)): + logger.warning(u'%s is set to %s' % (setting, value)) + return value + else: + return unicode(value).format(**self.as_dict()) url = property(functools.partial(_from_settings, key='URL')) save_as = property(functools.partial(_from_settings, key='SAVE_AS')) diff --git a/pelican/writers.py b/pelican/writers.py index 058be333..6eb00d7e 100644 --- a/pelican/writers.py +++ b/pelican/writers.py @@ -99,7 +99,11 @@ class Writer(object): :param **kwargs: additional variables to pass to the templates """ - if not name: return + if name is False: + return + elif not name: + # other stuff, just return for now + return def _write_file(template, localcontext, output_path, name): """Render the template write the file."""