github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't specify the default when accessing settings.

Browse source 
There is no need to do this, since all the default values are already provided
in the default settings dict (in settings.py)
This commit is contained in:
Alexis Metaireau 2012-03-09 16:22:28 +01:00
commit 8a442e726a
1 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

37
pelican/contents.py
View file

@ -111,16 +111,14 @@ class Page(object):
@property @property
def url(self): def url(self):
if self.in_default_lang: if self.in_default_lang:
return self.settings.get('PAGE_URL', u'pages/{slug}.html').format(**self.url_format) return self.settings['PAGE_URL'].format(**self.url_format)
return self.settings['PAGE_LANG_URL'].format(**self.url_format)
return self.settings.get('PAGE_LANG_URL', u'pages/{slug}-{lang}.html').format(**self.url_format)
@property @property
def save_as(self): def save_as(self):
if self.in_default_lang: if self.in_default_lang:
return self.settings.get('PAGE_SAVE_AS', u'pages/{slug}.html').format(**self.url_format) return self.settings['PAGE_SAVE_AS'].format(**self.url_format)
return self.settings['PAGE_LANG_SAVE_AS'].format(**self.url_format)
return self.settings.get('PAGE_LANG_SAVE_AS', u'pages/{slug}-{lang}.html').format(**self.url_format)
@property @property
def content(self): def content(self):
@ -148,21 +146,20 @@ class Article(Page):
@property @property
def url(self): def url(self):
if self.in_default_lang: if self.in_default_lang:
return self.settings.get('ARTICLE_URL', u'{slug}.html').format(**self.url_format) return self.settings['ARTICLE_URL'].format(**self.url_format)
return self.settings['ARTICLE_LANG_URL'].format(**self.url_format)
return self.settings.get('ARTICLE_LANG_URL', u'{slug}-{lang}.html').format(**self.url_format)
@property @property
def save_as(self): def save_as(self):
if self.in_default_lang: if self.in_default_lang:
return self.settings.get('ARTICLE_SAVE_AS', u'{slug}.html').format(**self.url_format) return self.settings['ARTICLE_SAVE_AS'].format(**self.url_format)
return self.settings['ARTICLE_LANG_SAVE_AS'].format(**self.url_format)
return self.settings.get('ARTICLE_LANG_SAVE_AS', u'{slug}-{lang}.html').format(**self.url_format)
class Quote(Page): class Quote(Page):
base_properties = ('author', 'date') base_properties = ('author', 'date')
class URLWrapper(object): class URLWrapper(object):
def __init__(self, name, settings): def __init__(self, name, settings):
self.name = unicode(name) self.name = unicode(name)
@ -184,14 +181,16 @@ class URLWrapper(object):
def url(self): def url(self):
return '%s.html' % self.name return '%s.html' % self.name
class Category(URLWrapper): class Category(URLWrapper):
@property @property
def url(self): def url(self):
return self.settings.get('CATEGORY_URL', u'category/{name}.html').format(name=self.name) return self.settings['CATEGORY_URL'].format(name=self.name)
@property @property
def save_as(self): def save_as(self):
return self.settings.get('CATEGORY_SAVE_AS', u'category/{name}.html').format(name=self.name) return self.settings['CATEGORY_SAVE_AS'].format(name=self.name)
class Tag(URLWrapper): class Tag(URLWrapper):
def __init__(self, name, *args, **kwargs): def __init__(self, name, *args, **kwargs):
@ -199,20 +198,22 @@ class Tag(URLWrapper):
@property @property
def url(self): def url(self):
return self.settings.get('TAG_URL', u'tag/{name}.html').format(name=self.name) return self.settings['TAG_URL'].format(name=self.name)
@property @property
def save_as(self): def save_as(self):
return self.settings.get('TAG_SAVE_AS', u'tag/{name}.html').format(name=self.name) return self.settings['TAG_SAVE_AS'].format(name=self.name)
class Author(URLWrapper): class Author(URLWrapper):
@property @property
def url(self): def url(self):
return self.settings.get('AUTHOR_URL', u'author/{name}.html').format(name=self.name) return self.settings['AUTHOR_URL'].format(name=self.name)
@property @property
def save_as(self): def save_as(self):
return self.settings.get('AUTHOR_SAVE_AS', u'author/{name}.html').format(name=self.name) return self.settings['AUTHOR_SAVE_AS'].format(name=self.name)
def is_valid_content(content, f): def is_valid_content(content, f):
try: try: