1 files changed, 9 insertions, 10 deletions

diff --git a/web/macros.py b/web/macros.py
index df64a26..3eb1046 100644
--- a/web/macros.py
+++ b/web/macros.py
@@ -1,19 +1,19 @@
 import email.utils
+import math
 import os.path
 import time
 
-plugins_release = '2.3.1'
+plugins_release = '3.0.0-rc1'
 mib_release = '1.0.1'
 release_notes = 'news/release-%s.html' % plugins_release.replace('.', '-')
 site_url = 'https://www.monitoring-plugins.org/'
 feeds = """These project news articles are also available as an
 [RSS feed][rss]{: rel="alternate" type="application/rss+xml" }.  Additional
-stuff is posted to [Twitter][twitter], so you might want to [follow us][follow]
-there as well.
+stuff is posted to [Mastodon][mastodon], so you might want to follow us there as
+well.
 
 [rss]: rss.xml "RSS Feed"
-[twitter]: https://twitter.com/ "Twitter"
-[follow]: https://twitter.com/intent/follow?screen_name=monitorplugins "Follow Us"
+[mastodon]: https://fosstodon.org/@monitoringplugins "Mastodon"
 """
 
 page = {
@@ -68,9 +68,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)
-    fp.close()
+    with open(os.path.join(output, 'rss.xml'), 'w', encoding='utf-8') as fp:
+        fp.write(rss)
 
 #
 # News
@@ -80,7 +79,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 +107,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)