=== modified file 'INSTALL'
--- INSTALL	2019-08-24 14:52:59 +0000
+++ INSTALL	2019-08-30 21:46:16 +0000
@@ -41,7 +41,10 @@
     + GnuTLS 3.3          https://www.gnutls.org/
       (but not 3.6.0 or later, until 3.6.6, which works)
     + Avahi 0.6.16        https://www.avahi.org/
-    + Python 2.7          https://www.python.org/
+    + Python 3           https://www.python.org/
+      Note: Python 2.7 is still supported, if the "mandos",
+      "mandos-ctl", and "mandos-monitor" files are edited to contain
+      "#!/usr/bin/python" instead of python3.
     + dbus-python 0.82.4 https://dbus.freedesktop.org/doc/dbus-python/
     + PyGObject 3.8      https://wiki.gnome.org/Projects/PyGObject
     + pkg-config https://www.freedesktop.org/wiki/Software/pkg-config/
@@ -53,8 +56,8 @@
     + ssh-keyscan from OpenSSH http://www.openssh.com/
     
     Package names:
-    avahi-daemon python python-dbus python-gi python-urwid pkg-config
-    fping ssh-client
+    avahi-daemon python3 python3-dbus python3-gi python3-urwid
+    pkg-config fping ssh-client
     
 *** Mandos Client
     + GNU C Library 2.17 https://gnu.org/software/libc/

=== modified file 'debian/control'
--- debian/control	2019-08-23 22:54:03 +0000
+++ debian/control	2019-08-30 21:46:16 +0000
@@ -9,8 +9,8 @@
 	libglib2.0-dev (>=2.40), libgnutls28-dev (>= 3.3.0),
 	libgnutls28-dev (>= 3.6.6) | libgnutls28-dev (<< 3.6.0),
 	xsltproc, pkg-config, libnl-route-3-dev, systemd
-Build-Depends-Indep: python (>= 2.7), python (<< 3), python-dbus,
-	python-gi, po-debconf
+Build-Depends-Indep: python (>= 3), python3-dbus, python3-gi,
+	po-debconf
 Standards-Version: 4.4.0
 Vcs-Bzr: https://ftp.recompile.se/pub/mandos/trunk
 Vcs-Browser: https://bzr.recompile.se/loggerhead/mandos/trunk/files
@@ -19,11 +19,11 @@
 
 Package: mandos
 Architecture: all
-Depends: ${misc:Depends}, python (>= 2.7), python (<< 3),
-	libgnutls30 (>= 3.3.0),
+Depends: ${misc:Depends}, python (>= 3), libgnutls30 (>= 3.3.0),
 	libgnutls30 (>= 3.6.6) | libgnutls30 (<< 3.6.0),
-	python-dbus, python-gi, avahi-daemon, adduser, python-urwid,
-	gnupg2 | gnupg, systemd-sysv | lsb-base (>= 3.0-6),
+	python3-dbus, python3-gi, avahi-daemon, adduser,
+	python3-urwid, gnupg2 | gnupg,
+	systemd-sysv | lsb-base (>= 3.0-6),
 	debconf (>= 1.5.5) | debconf-2.0
 Recommends: ssh-client | fping
 Suggests: libc6-dev | libc-dev, c-compiler

=== modified file 'mandos'
--- mandos	2019-08-30 21:10:13 +0000
+++ mandos	2019-08-30 21:46:16 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3 -b
 # -*- mode: python; after-save-hook: (lambda () (let ((command (if (fboundp 'file-local-name) (file-local-name (buffer-file-name)) (or (file-remote-p (buffer-file-name) 'localname) (buffer-file-name))))) (if (= (progn (if (get-buffer "*Test*") (kill-buffer "*Test*")) (process-file-shell-command (format "%s --check" (shell-quote-argument command)) nil "*Test*")) 0) (let ((w (get-buffer-window "*Test*"))) (if w (delete-window w))) (progn (with-current-buffer "*Test*" (compilation-mode)) (display-buffer "*Test*" '(display-buffer-in-side-window)))))); coding: utf-8 -*-
 #
 # Mandos server - give out binary blobs to connecting clients.

=== modified file 'mandos-ctl'
--- mandos-ctl	2019-08-18 20:06:18 +0000
+++ mandos-ctl	2019-08-30 21:46:16 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3 -bb
 # -*- after-save-hook: (lambda () (let ((command (if (fboundp 'file-local-name) (file-local-name (buffer-file-name)) (or (file-remote-p (buffer-file-name) 'localname) (buffer-file-name))))) (if (= (progn (if (get-buffer "*Test*") (kill-buffer "*Test*")) (process-file-shell-command (format "%s --check" (shell-quote-argument command)) nil "*Test*")) 0) (let ((w (get-buffer-window "*Test*"))) (if w (delete-window w))) (progn (with-current-buffer "*Test*" (compilation-mode)) (display-buffer "*Test*" '(display-buffer-in-side-window)))))); coding: utf-8 -*-
 #
 # Mandos Monitor - Control and monitor the Mandos server

=== modified file 'mandos-monitor'
--- mandos-monitor	2019-08-24 15:33:58 +0000
+++ mandos-monitor	2019-08-30 21:46:16 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3 -bb
 # -*- mode: python; coding: utf-8 -*-
 #
 # Mandos Monitor - Control and monitor the Mandos server