Switch to latest Poole version

Use the latest Poole code currently available at:

https://hg.sr.ht/~obensonne/poole

Rather than including the code in this repository, expect it to be found
in the PATH (e.g., in $prefix/opt/poole/env/bin).  As Poole is
Python-3-based now, update web/macros.py accordingly.

1 files changed, 5 insertions, 5 deletions

diff --git a/web/macros.py b/web/macros.py
index 3ef93e6..9dfadb2 100644
--- a/web/macros.py
+++ b/web/macros.py
@@ -1,4 +1,5 @@
 import email.utils
+import math
 import os.path
 import time
 
@@ -68,9 +69,8 @@ def hook_postconvert_rss():
     desc = 'Announcements published by the Monitoring Plugins Development Team.'
     date = email.utils.formatdate()
     rss = _RSS % (title, link, desc, date, date, items)
-    fp = open(os.path.join(output, 'rss.xml'), 'w')
-    fp.write(rss.encode('utf-8'))
-    fp.close()
+    with open(os.path.join(output, 'rss.xml'), 'w', encoding='utf-8') as fp:
+        fp.write(rss)
 
 #
 # News
@@ -80,7 +80,7 @@ def hook_preconvert_news():
     posts_per_page = 10
     posts = [p for p in pages if 'date' in p]
     posts.sort(key=lambda p: p.date, reverse=True)
-    n_news_pages = len(posts) / posts_per_page
+    n_news_pages = math.ceil(len(posts) / posts_per_page)
     if len(posts) % posts_per_page > 0:
         n_news_pages += 1
     for i, chunk in enumerate(next_news_chunk(posts, posts_per_page)):
@@ -108,7 +108,7 @@ def make_news_page(posts, current_index):
         teaser = ['# ' + title]
     for p in posts:
         source = list()
-        author = p.author.encode('ascii', 'xmlcharrefreplace')
+        author = p.author
         timestamp = time.strptime(p.date, '%Y-%m-%d')
         author_date = author + ', ' + time.strftime('%B %-e, %Y', timestamp)
         teaser.append('## %s' % p.title)