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

Refactor URLWrapper subclasses to make slugs settable again (#2242)

Browse source 
URLWrapper slugs are intended to be settable, but because all of the
concrete URLWrapper subclasses override the _getter_ for .slug using
@property, the setter in the superclass becomes inaccessible.  Fix
this by refactoring out the code that the subclasses actually need
to override to a normal helper method.
This commit is contained in:
Zack Weinberg 2017-10-31 11:30:31 -04:00
commit f43ffd9073
1 changed files with 15 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

38
pelican/urlwrappers.py
View file

@ -36,8 +36,7 @@ class URLWrapper(object):
@property
def slug(self):
if self._slug is None:
self._slug = slugify(self.name,
self.settings.get('SLUG_SUBSTITUTIONS', ()))
self._slug = slugify(self.name, self._slug_substitutions())
return self._slug
@slug.setter
@ -46,6 +45,9 @@ class URLWrapper(object):
self._slug_from_name = False
self._slug = slug
def _slug_substitutions(self):
return self.settings.get('SLUG_SUBSTITUTIONS', ()))
def as_dict(self):
d = self.__dict__
d['name'] = self.name
@ -112,33 +114,23 @@ class URLWrapper(object):
class Category(URLWrapper):
@property
def slug(self):
if self._slug is None:
substitutions = self.settings.get('SLUG_SUBSTITUTIONS', ())
substitutions += tuple(self.settings.get('CATEGORY_SUBSTITUTIONS',
()))
self._slug = slugify(self.name, substitutions)
return self._slug
def _slug_substitutions(self):
substitutions = self.settings.get('SLUG_SUBSTITUTIONS', ())
substitutions += tuple(self.settings.get('CATEGORY_SUBSTITUTIONS', ()))
return substitutions
class Tag(URLWrapper):
def __init__(self, name, *args, **kwargs):
super(Tag, self).__init__(name.strip(), *args, **kwargs)
@property
def slug(self):
if self._slug is None:
substitutions = self.settings.get('SLUG_SUBSTITUTIONS', ())
substitutions += tuple(self.settings.get('TAG_SUBSTITUTIONS', ()))
self._slug = slugify(self.name, substitutions)
return self._slug
def _slug_substitutions(self):
substitutions = self.settings.get('SLUG_SUBSTITUTIONS', ())
substitutions += tuple(self.settings.get('TAG_SUBSTITUTIONS', ()))
return substitutions
class Author(URLWrapper):
@property
def slug(self):
if self._slug is None:
self._slug = slugify(self.name,
self.settings.get('AUTHOR_SUBSTITUTIONS', ()))
return self._slug
def _slug_substitutions(self):
# ??? Should this include SLUG_SUBSTITUTIONS as well?
return self.settings.get('AUTHOR_SUBSTITUTIONS', ())