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

Merge pull request #2477 from oulenz/tag_attribute

Browse source 
Remove non-existent tag attribute handling from Content.url_format
This commit is contained in:
Justin Mayer 2018-11-25 23:34:41 -07:00 • committed by GitHub
commit c4eda992d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pelican/contents.py
View file

@ -213,7 +213,6 @@ class Content(object):
'lang': getattr(self, 'lang', 'en'), 'lang': getattr(self, 'lang', 'en'),
'date': getattr(self, 'date', SafeDatetime.now()), 'date': getattr(self, 'date', SafeDatetime.now()),
'author': self.author.slug if hasattr(self, 'author') else '', 'author': self.author.slug if hasattr(self, 'author') else '',
'tag': self.tag.slug if hasattr(self, 'tag') else '',
'category': self.category.slug if hasattr(self, 'category') else '' 'category': self.category.slug if hasattr(self, 'category') else ''
}) })
return metadata return metadata

15
pelican/tests/test_contents.py
View file

@ -11,7 +11,7 @@ from jinja2.utils import generate_lorem_ipsum
import six import six
from pelican.contents import Article, Author, Category, Page, Static, Tag from pelican.contents import Article, Author, Category, Page, Static
from pelican.settings import DEFAULT_CONFIG from pelican.settings import DEFAULT_CONFIG
from pelican.signals import content_object_init from pelican.signals import content_object_init
from pelican.tests.support import LoggedTestCase, get_context, get_settings,\ from pelican.tests.support import LoggedTestCase, get_context, get_settings,\
@ -609,19 +609,6 @@ class TestArticle(TestPage):
article = Article(**article_kwargs) article = Article(**article_kwargs)
self.assertEqual(article.url, 'fedora.qa/this-week-in-fedora-qa/') self.assertEqual(article.url, 'fedora.qa/this-week-in-fedora-qa/')
def test_slugify_tags_with_dots(self):
settings = get_settings()
settings['TAG_REGEX_SUBSTITUTIONS'] = [
('Fedora QA', 'fedora.qa'),
]
settings['ARTICLE_URL'] = '{tag}/{slug}/'
article_kwargs = self._copy_page_kwargs()
article_kwargs['metadata']['tag'] = Tag('Fedora QA', settings)
article_kwargs['metadata']['title'] = 'This Week in Fedora QA'
article_kwargs['settings'] = settings
article = Article(**article_kwargs)
self.assertEqual(article.url, 'fedora.qa/this-week-in-fedora-qa/')
def test_valid_save_as_detects_breakout(self): def test_valid_save_as_detects_breakout(self):
settings = get_settings() settings = get_settings()
article_kwargs = self._copy_page_kwargs() article_kwargs = self._copy_page_kwargs()