rst: Use Python 3 instead of Python 2

Signed-off-by: Simon McVittie <smcv@debian.org>

diff --git a/.gitignore b/.gitignore
index d27140896a6c3dc4ad0702dccd20dec78cd38a4a..a8d5ae77f63cafe05aec5b97266b561ae5242490 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ pm_to_blib
 /MYMETA.json
 /MYMETA.yml
 *.man
+/plugins/__pycache__/
 /po/cover_db
 /po/html/
 po/po2wiki_stamp

diff --git a/CHANGELOG b/CHANGELOG
index e528fa2650f9179fed36f0c5eb64f948a20ae19e..c481e41c3228808b7308cc26d59c687d0389497e 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@ ikiwiki (3.20180106) UNRELEASED; urgency=medium
     Discount >= 2.2.0 (Closes: #888055)
   * img: Fix auto-detection of image format (if enabled, which is
     strongly discouraged) with ImageMagick >= 6.9.8-3
+  * rst: Use Python 3 instead of Python 2
   * build: `set -e` before each `for` loop, so that errors are reliably
     trapped
   * build: Use if/then instead of `||` so that the `-e` flag works

diff --git a/debian/control b/debian/control
index 4dbb39db3fb490b169051dda93657990539aff5b..6af39bd837b07f979ce9094c77892c86a46b7510 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -96,8 +96,8 @@ Suggests:
  libxml-writer-perl,
  po4a (>= 0.35-1),
  polygen,
- python,
- python-docutils,
+ python3,
+ python3-docutils,
  texlive,
  tidy,
  viewvc | gitweb | viewcvs,

diff --git a/doc/todo/consider_using_python3_for_rst_plugin.mdwn b/doc/todo/consider_using_python3_for_rst_plugin.mdwn
index b95dff641730829cd26990ebd5c24d1051278911..741c78d38c0b5e7dfe0f45da245dfe55c69199fd 100644 (file)
--- a/doc/todo/consider_using_python3_for_rst_plugin.mdwn
+++ b/doc/todo/consider_using_python3_for_rst_plugin.mdwn
@@ -23,3 +23,5 @@ change upstream immediately to give other maintainers a chance to comment. Thoug
 > change to ikiwiki. Can't attest for other situations, but am generally
 > biased toward biting future bullets as early as possible.
 > --[[schmonz]]
+
+>> Nobody objected, so it's now python3 for the next release. [[done]] --[[smcv]]

diff --git a/plugins/proxy.py b/plugins/proxy.py
index b61eb466c8d47ef839fc24e5d0ba54be3a9b23fa..2a6222aa05ed718f2814d23f83c4aeef690b0498 100755 (executable)
--- a/plugins/proxy.py
+++ b/plugins/proxy.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
 # proxy.py — helper for Python-based external (xml-rpc) ikiwiki plugins

diff --git a/plugins/pythondemo b/plugins/pythondemo
index 5e031805be260e8409c0fa81ffdc0ec3795216e0..213e9bb27c910dc8d459221e7eccc1a0b3ef9b1a 100755 (executable)
--- a/plugins/pythondemo
+++ b/plugins/pythondemo
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
 # pythondemo — demo Python ikiwiki plugin

diff --git a/plugins/rst b/plugins/rst
index ba0f543f9244a04a10bc8b35b926cc0f30743e19..08eb54f85d33392ff33d78eed915ba9e6993ae24 100755 (executable)
--- a/plugins/rst
+++ b/plugins/rst
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
 # rst — xml-rpc-based ikiwiki plugin to process RST files