Merge branch tests into main. (See #44)

Conflicts:
	pelican/contents.py
	pelican/settings.py
	samples/pelican.conf.py

pelican/contents.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from pelican.utils import slugify, truncate_html_words
 from pelican.log import *
+from pelican.settings import _DEFAULT_CONFIG
 
 class Page(object):
     """Represents a page
@@ -10,31 +11,45 @@ class Page(object):
     """
     mandatory_properties = ('title',)
 
-    def __init__(self, content, metadata={}, settings={}, filename=None):
+    def __init__(self, content, metadata=None, settings=None, filename=None):
+        # init parameters
+        if not metadata:
+            metadata = {}
+        if not settings:
+            settings = _DEFAULT_CONFIG
+
         self._content = content
         self.translations = []
 
         self.status = "published"  # default value
 
-        local_metadata = dict(settings['DEFAULT_METADATA'])
+        local_metadata = dict(settings.get('DEFAULT_METADATA', ()))
         local_metadata.update(metadata)
+
+        # set metadata as attributes
         for key, value in local_metadata.items():
             setattr(self, key.lower(), value)
-
+        
+        # default author to the one in settings if not defined
         if not hasattr(self, 'author'):
             if 'AUTHOR' in settings:
                 self.author = settings['AUTHOR']
 
-        default_lang = settings.get('DEFAULT_LANG').lower()
-        if not hasattr(self, 'lang'):
-            self.lang = default_lang
+        # manage languages
+        self.in_default_lang = True
+        if 'DEFAULT_LANG' in settings:
+            default_lang = settings['DEFAULT_LANG'].lower()
+            if not hasattr(self, 'lang'):
+                self.lang = default_lang
 
-        self.in_default_lang = (self.lang == default_lang)
+            self.in_default_lang = (self.lang == default_lang)
 
-        if not hasattr(self, 'slug'):
+        # create the slug if not existing, fro mthe title
+        if not hasattr(self, 'slug') and hasattr(self, 'title'):
             self.slug = slugify(self.title)
 
-        if not hasattr(self, 'save_as'):
+        # create save_as from the slug (+lang)
+        if not hasattr(self, 'save_as') and hasattr(self, 'slug'):
             if self.in_default_lang:
                 self.save_as = '%s.html' % self.slug
                 clean_url = '%s/' % self.slug
@@ -42,16 +57,18 @@ class Page(object):
                 self.save_as = '%s-%s.html' % (self.slug, self.lang)
                 clean_url = '%s-%s/' % (self.slug, self.lang)
 
+        # change the save_as regarding the settings
         if settings.get('CLEAN_URLS', False):
             self.url = clean_url
-        else:
+        elif hasattr(self, 'save_as'):
             self.url = self.save_as
 
         if filename:
             self.filename = filename
 
+        # manage the date format
         if not hasattr(self, 'date_format'):
-            if self.lang in settings['DATE_FORMATS']:
+            if hasattr(self, 'lang') and self.lang in settings['DATE_FORMATS']:
                 self.date_format = settings['DATE_FORMATS'][self.lang]
             else:
                 self.date_format = settings['DEFAULT_DATE_FORMAT']
@@ -59,15 +76,14 @@ class Page(object):
         if hasattr(self, 'date'):
             self.locale_date = self.date.strftime(self.date_format.encode('ascii','xmlcharrefreplace')).decode('utf')
 
+        # manage summary
         if not hasattr(self, 'summary'):
             self.summary = property(lambda self: truncate_html_words(self.content, 50)).__get__(self, Page)
 
+        # manage status
         if not hasattr(self, 'status'):
             self.status = settings['DEFAULT_STATUS']
 
-        # store the settings ref.
-        self._settings = settings
-
     def check_properties(self):
         """test that each mandatory property is set."""
         for prop in self.mandatory_properties: