From fa82e19c1ffa18bfb5e03a8311727a022525c53f Mon Sep 17 00:00:00 2001 From: Bruno Binet Date: Sat, 24 Nov 2012 00:26:46 +0100 Subject: [PATCH] change default value for DEFAULT_DATE to None (was 'fs' => guess from file mtime) --- docs/settings.rst | 2 +- pelican/generators.py | 2 +- pelican/settings.py | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/settings.rst b/docs/settings.rst index be091596..a7cf107b 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -43,7 +43,7 @@ Setting name (default value) What doe `DISPLAY_PAGES_ON_MENU` (``True``) Whether to display pages on the menu of the template. Templates may or not honor this setting. -`DEFAULT_DATE` (``fs``) The default date you want to use. +`DEFAULT_DATE` (``None``) The default date you want to use. If 'fs', Pelican will use the file system timestamp information (mtime) if it can't get date information from the metadata. diff --git a/pelican/generators.py b/pelican/generators.py index b1d9ec12..020a3711 100644 --- a/pelican/generators.py +++ b/pelican/generators.py @@ -331,7 +331,7 @@ class ArticlesGenerator(Generator): if category != '': metadata['category'] = Category(category, self.settings) - if 'date' not in metadata and self.settings['DEFAULT_DATE']: + if 'date' not in metadata and self.settings.get('DEFAULT_DATE'): if self.settings['DEFAULT_DATE'] == 'fs': metadata['date'] = datetime.datetime.fromtimestamp( os.stat(f).st_ctime) diff --git a/pelican/settings.py b/pelican/settings.py index 49879f84..d2c0cef5 100644 --- a/pelican/settings.py +++ b/pelican/settings.py @@ -36,7 +36,6 @@ _DEFAULT_CONFIG = {'PATH': '.', 'OUTPUT_SOURCES_EXTENSION': '.text', 'USE_FOLDER_AS_CATEGORY': True, 'DEFAULT_CATEGORY': 'misc', - 'DEFAULT_DATE': 'fs', 'WITH_FUTURE_DATES': True, 'CSS_FILE': 'main.css', 'NEWEST_FIRST_ARCHIVES': True,