wiki: Make make_breadcrumbs() return a list

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/backend/wiki.py b/src/backend/wiki.py
index d3fe2d9aba81685f3becd9a729b69ec03cd1d96f..f43434f46170adf25653fab491d105fe7425cc9b 100644 (file)
--- a/src/backend/wiki.py
+++ b/src/backend/wiki.py
@@ -57,19 +57,15 @@ class Wiki(misc.Object):
                # Just creates a blank last version of the page
                self.create_page(page, author=author, content=None, **kwargs)
 
-       @staticmethod
-       def _split_url(url):
+       def make_breadcrumbs(self, url):
+               # Split and strip all empty elements (double slashes)
                parts = list(e for e in url.split("/") if e)
 
-               num_parts = len(parts)
-               for i in range(1, num_parts):
-                       yield "/".join(parts[:i])
-
-       def make_breadcrumbs(self, url):
-               for part in self._split_url(url):
-                       title = self.get_page_title(part, os.path.basename(part))
+               ret = []
+               for part in ("/".join(parts[:i] for i in range(1, len(parts))):
+                       ret.append(("/%s" % part, self.get_page_title(part, os.path.basename(part))))
 
-                       yield ("/%s" % part, title)
+               return ret
 
 
 class Page(misc.Object):