From d81f06b3f8c9d546a4b75ca5a5ab9b306f684560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs?= Date: Mon, 23 Sep 2019 23:03:38 -0500 Subject: [PATCH] [neighbors] Fix iter3() error on Python 3.7 and pass flake8 From PR: https://github.com/getpelican/pelican-plugins/pull/1186/files --- plugins/neighbors/neighbors.py | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/plugins/neighbors/neighbors.py b/plugins/neighbors/neighbors.py index aaa564e..f76589f 100644 --- a/plugins/neighbors/neighbors.py +++ b/plugins/neighbors/neighbors.py @@ -8,14 +8,19 @@ variables to the article's context """ from pelican import signals + def iter3(seq): - it = iter(seq) - nxt = None - cur = next(it) - for prv in it: - yield nxt, cur, prv + """Generate one triplet per element in 'seq' following PEP-479.""" + nxt, cur = None, None + for prv in seq: + if cur: + yield nxt, cur, prv nxt, cur = cur, prv - yield nxt, cur, None + # Don't yield anything if empty seq + if cur: + # Yield last element in seq (also if len(seq) == 1) + yield nxt, cur, None + def get_translation(article, prefered_language): if not article: @@ -25,6 +30,7 @@ def get_translation(article, prefered_language): return translation return article + def set_neighbors(articles, next_name, prev_name): for nxt, cur, prv in iter3(articles): exec("cur.{} = nxt".format(next_name)) @@ -32,27 +38,29 @@ def set_neighbors(articles, next_name, prev_name): for translation in cur.translations: exec( - "translation.{} = get_translation(nxt, translation.lang)".format( - next_name)) + "translation.{} = get_translation(nxt, translation.lang)" + .format(next_name)) exec( - "translation.{} = get_translation(prv, translation.lang)".format( - prev_name)) + "translation.{} = get_translation(prv, translation.lang)" + .format(prev_name)) + def neighbors(generator): set_neighbors(generator.articles, 'next_article', 'prev_article') for category, articles in generator.categories: - articles.sort(key=(lambda x: x.date), reverse=(True)) + articles.sort(key=lambda x: x.date, reverse=True) set_neighbors( articles, 'next_article_in_category', 'prev_article_in_category') if hasattr(generator, 'subcategories'): for subcategory, articles in generator.subcategories: - articles.sort(key=(lambda x: x.date), reverse=(True)) + articles.sort(key=lambda x: x.date, reverse=True) index = subcategory.name.count('/') next_name = 'next_article_in_subcategory{}'.format(index) prev_name = 'prev_article_in_subcategory{}'.format(index) set_neighbors(articles, next_name, prev_name) + def register(): signals.article_generator_finalized.connect(neighbors)