aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--CHANGELOG1
-rw-r--r--debian/control4
-rw-r--r--doc/todo/consider_using_python3_for_rst_plugin.mdwn2
-rwxr-xr-xplugins/proxy.py2
-rwxr-xr-xplugins/pythondemo2
-rwxr-xr-xplugins/rst2
7 files changed, 9 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index d27140896..a8d5ae77f 100644
--- 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 e528fa265..c481e41c3 100644
--- 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 4dbb39db3..6af39bd83 100644
--- 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 b95dff641..741c78d38 100644
--- 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 b61eb466c..2a6222aa0 100755
--- 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 5e031805b..213e9bb27 100755
--- 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 ba0f543f9..08eb54f85 100755
--- 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