rst: Use Python 3 instead of Python 2

Signed-off-by: Simon McVittie <smcv@debian.org>
master
Simon McVittie 2018-02-28 10:18:30 +00:00
parent 8cc7a0902a
commit 54f6ca83c5
7 changed files with 9 additions and 5 deletions

1
.gitignore vendored
View File

@ -13,6 +13,7 @@ pm_to_blib
/MYMETA.json /MYMETA.json
/MYMETA.yml /MYMETA.yml
*.man *.man
/plugins/__pycache__/
/po/cover_db /po/cover_db
/po/html/ /po/html/
po/po2wiki_stamp po/po2wiki_stamp

View File

@ -9,6 +9,7 @@ ikiwiki (3.20180106) UNRELEASED; urgency=medium
Discount >= 2.2.0 (Closes: #888055) Discount >= 2.2.0 (Closes: #888055)
* img: Fix auto-detection of image format (if enabled, which is * img: Fix auto-detection of image format (if enabled, which is
strongly discouraged) with ImageMagick >= 6.9.8-3 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 * build: `set -e` before each `for` loop, so that errors are reliably
trapped trapped
* build: Use if/then instead of `||` so that the `-e` flag works * build: Use if/then instead of `||` so that the `-e` flag works

4
debian/control vendored
View File

@ -96,8 +96,8 @@ Suggests:
libxml-writer-perl, libxml-writer-perl,
po4a (>= 0.35-1), po4a (>= 0.35-1),
polygen, polygen,
python, python3,
python-docutils, python3-docutils,
texlive, texlive,
tidy, tidy,
viewvc | gitweb | viewcvs, viewvc | gitweb | viewcvs,

View File

@ -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 > change to ikiwiki. Can't attest for other situations, but am generally
> biased toward biting future bullets as early as possible. > biased toward biting future bullets as early as possible.
> --[[schmonz]] > --[[schmonz]]
>> Nobody objected, so it's now python3 for the next release. [[done]] --[[smcv]]

View File

@ -1,4 +1,4 @@
#!/usr/bin/python #!/usr/bin/env python3
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# proxy.py — helper for Python-based external (xml-rpc) ikiwiki plugins # proxy.py — helper for Python-based external (xml-rpc) ikiwiki plugins

View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# pythondemo — demo Python ikiwiki plugin # pythondemo — demo Python ikiwiki plugin

View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# rst — xml-rpc-based ikiwiki plugin to process RST files # rst — xml-rpc-based ikiwiki plugin to process RST files