Bug #1493 — Memoize slugify when possible

getpelican · Oct 9, 2014 · e39dc95 · e39dc95
1 parent 7feb638
commit e39dc95
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
@@ -388,7 +388,7 @@ def test_template(self):
 
     def test_slugify_category_author(self):
         settings = get_settings()
-        settings['SLUG_SUBSTITUTIONS'] = [ ('C#', 'csharp') ]
+        settings['SLUG_SUBSTITUTIONS'] = (('C#', 'csharp'),)
         settings['ARTICLE_URL'] = '{author}/{category}/{slug}/'
         settings['ARTICLE_SAVE_AS'] = '{author}/{category}/{slug}/index.html'
         article_kwargs = self._copy_page_kwargs()

diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
@@ -41,6 +41,8 @@ def _key(self):
         return self.slug
 
     def _normalize_key(self, key):
+        if hasattr(key, 'name'):
+            key = key.name
         subs = self.settings.get('SLUG_SUBSTITUTIONS', ())
         return six.text_type(slugify(key, subs))
 

diff --git a/pelican/utils.py b/pelican/utils.py
@@ -239,7 +239,7 @@ def pelican_open(filename):
         content = content[1:]
     yield content
 
-
+@memoized
 def slugify(value, substitutions=()):
     """
     Normalizes string, converts to lowercase, removes non-alpha characters,