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

fix encoding errors

Browse source 
error was:codeEncodeError: 'ascii' codec can't encode character u'\xe9' [..]
This commit is contained in:
Bruno Binet 2012-03-02 16:32:05 +01:00 • committed by Kyle Fuller
commit 8bf0a22eb0
2 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

28
pelican/contents.py
View file

@ -106,16 +106,16 @@ 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', 'pages/{slug}.html').format(**self.url_format) return self.settings.get('PAGE_URL', u'pages/{slug}.html').format(**self.url_format)
return self.settings.get('PAGE_LANG_URL', 'pages/{slug}-{lang}.html').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', 'pages/{slug}.html').format(**self.url_format) return self.settings.get('PAGE_SAVE_AS', u'pages/{slug}.html').format(**self.url_format)
return self.settings.get('PAGE_LANG_SAVE_AS', 'pages/{slug}-{lang}.html').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):
@ -143,16 +143,16 @@ 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', '{slug}.html').format(**self.url_format) return self.settings.get('ARTICLE_URL', u'{slug}.html').format(**self.url_format)
return self.settings.get('ARTICLE_LANG_URL', '{slug}-{lang}.html').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', '{slug}.html').format(**self.url_format) return self.settings.get('ARTICLE_SAVE_AS', u'{slug}.html').format(**self.url_format)
return self.settings.get('ARTICLE_LANG_SAVE_AS', '{slug}-{lang}.html').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):
@ -182,11 +182,11 @@ class URLWrapper(object):
class Category(URLWrapper): class Category(URLWrapper):
@property @property
def url(self): def url(self):
return self.settings.get('CATEGORY_URL', 'category/{name}.html').format(name=self.name) return self.settings.get('CATEGORY_URL', u'category/{name}.html').format(name=self.name)
@property @property
def save_as(self): def save_as(self):
return self.settings.get('CATEGORY_SAVE_AS', 'category/{name}.html').format(name=self.name) return self.settings.get('CATEGORY_SAVE_AS', u'category/{name}.html').format(name=self.name)
class Tag(URLWrapper): class Tag(URLWrapper):
def __init__(self, name, *args, **kwargs): def __init__(self, name, *args, **kwargs):
@ -194,20 +194,20 @@ class Tag(URLWrapper):
@property @property
def url(self): def url(self):
return self.settings.get('TAG_URL', 'tag/{name}.html').format(name=self.name) return self.settings.get('TAG_URL', u'tag/{name}.html').format(name=self.name)
@property @property
def save_as(self): def save_as(self):
return self.settings.get('TAG_SAVE_AS', 'tag/{name}.html').format(name=self.name) return self.settings.get('TAG_SAVE_AS', u'tag/{name}.html').format(name=self.name)
class Author(URLWrapper): class Author(URLWrapper):
@property @property
def url(self): def url(self):
return self.settings.get('AUTHOR_URL', 'author/{name}.html').format(name=self.name) return self.settings.get('AUTHOR_URL', u'author/{name}.html').format(name=self.name)
@property @property
def save_as(self): def save_as(self):
return self.settings.get('AUTHOR_SAVE_AS', 'author/{name}.html').format(name=self.name) return self.settings.get('AUTHOR_SAVE_AS', u'author/{name}.html').format(name=self.name)
def is_valid_content(content, f): def is_valid_content(content, f):
try: try:

7
pelican/generators.py
View file

@ -182,7 +182,7 @@ class ArticlesGenerator(Generator):
write(tag.save_as, tag_template, self.context, tag=tag, write(tag.save_as, tag_template, self.context, tag=tag,
articles=articles, dates=dates, articles=articles, dates=dates,
paginated={'articles': articles, 'dates': dates}, paginated={'articles': articles, 'dates': dates},
page_name='tag/%s' % tag) page_name=u'tag/%s' % tag)
category_template = self.get_template('category') category_template = self.get_template('category')
for cat, articles in self.categories: for cat, articles in self.categories:
@ -190,7 +190,7 @@ class ArticlesGenerator(Generator):
write(cat.save_as, category_template, self.context, write(cat.save_as, category_template, self.context,
category=cat, articles=articles, dates=dates, category=cat, articles=articles, dates=dates,
paginated={'articles': articles, 'dates': dates}, paginated={'articles': articles, 'dates': dates},
page_name='category/%s' % cat) page_name=u'category/%s' % cat)
author_template = self.get_template('author') author_template = self.get_template('author')
for aut, articles in self.authors: for aut, articles in self.authors:
@ -198,7 +198,7 @@ class ArticlesGenerator(Generator):
write(aut.save_as, author_template, self.context, write(aut.save_as, author_template, self.context,
author=aut, articles=articles, dates=dates, author=aut, articles=articles, dates=dates,
paginated={'articles': articles, 'dates': dates}, paginated={'articles': articles, 'dates': dates},
page_name='author/%s' % aut) page_name=u'author/%s' % aut)
for article in self.drafts: for article in self.drafts:
write('drafts/%s.html' % article.slug, article_template, self.context, write('drafts/%s.html' % article.slug, article_template, self.context,
@ -212,7 +212,6 @@ class ArticlesGenerator(Generator):
files = self.get_files(self.path, exclude=['pages',]) files = self.get_files(self.path, exclude=['pages',])
all_articles = [] all_articles = []
for f in files: for f in files:
try: try:
content, metadata = read_file(f, settings=self.settings) content, metadata = read_file(f, settings=self.settings)
except Exception, e: except Exception, e: