Switch all build scripts to python3.

Since we only support jessie as build host, and jessie knowingly does have
python3 (although not by default), we don't really need to worry about being
both 2 and 3 compatible.

9 files changed, 14 insertions, 13 deletions

diff --git a/README.md b/README.md
index 11edb5f..0d6e53c 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ There are several directories with their own purpose:
 
 To build a VyOS image, you need a machine that runs Debian Jessie. Other build hosts are not supported.
 
-Several packages are required for building the ISO and all packages, namely live-build, pbuilder, python-pystache and devscripts.
+Several packages are required for building the ISO and all packages, namely python3, live-build, pbuilder, python3-pystache and devscripts.
 Individual packages may have other build dependencies. If some packages are missing, build scripts will tell you.
 
 ## Building the ISO image
diff --git a/scripts/build-config b/scripts/build-config
index d273717..9ea92e1 100755
--- a/scripts/build-config
+++ b/scripts/build-config
@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+#
 # Copyright (C) 2015 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/scripts/check-build-env b/scripts/check-build-env
index 6dcf885..7f02c02 100755
--- a/scripts/check-build-env
+++ b/scripts/check-build-env
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (C) 2015 VyOS maintainers and contributors
 #
@@ -32,7 +32,7 @@ deps = {
        'live-build',
        'pbuilder',
        'devscripts',
-       'python-pystache'
+       'python3-pystache'
     ],
    'binaries': []
 }
diff --git a/scripts/check-config b/scripts/check-config
index 55d5467..d223661 100755
--- a/scripts/check-config
+++ b/scripts/check-config
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (C) 2015 VyOS maintainers and contributors
 #
diff --git a/scripts/check-vm-build-env b/scripts/check-vm-build-env
index c32f2b1..8efab84 100755
--- a/scripts/check-vm-build-env
+++ b/scripts/check-vm-build-env
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (C) 2016 VyOS maintainers and contributors
 #
diff --git a/scripts/live-build-config b/scripts/live-build-config
index cb9e84d..2e2d470 100755
--- a/scripts/live-build-config
+++ b/scripts/live-build-config
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (C) 2015 VyOS maintainers and contributors
 #
diff --git a/scripts/make-version-file b/scripts/make-version-file
index 6c59709..3bb3331 100755
--- a/scripts/make-version-file
+++ b/scripts/make-version-file
@@ -1,4 +1,5 @@
-#!/usr/bin/python
+#!/usr/bin/python3
+#
 # Copyright (C) 2016 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
@@ -19,7 +20,6 @@
 #   that is included in the image and used by 'show version' command
 #   and install/upgrade scripts.
 
-from __future__ import print_function
 import os
 import datetime
 import json
diff --git a/scripts/pbuilder-setup b/scripts/pbuilder-setup
index fbd49a4..a89348b 100755
--- a/scripts/pbuilder-setup
+++ b/scripts/pbuilder-setup
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (C) 2015 VyOS maintainers and contributors
 #
@@ -50,4 +50,3 @@ result = os.system(pbuilder_create_command)
 if result > 0:
     print("pbuilder environment bootstrap failed")
     sys.exit(1)
-
diff --git a/scripts/query-json b/scripts/query-json
index 23e64ef..2f1ea32 100755
--- a/scripts/query-json
+++ b/scripts/query-json
@@ -1,4 +1,5 @@
-#!/usr/bin/python
+#!/usr/bin/python3
+#
 # Copyright (C) 2016 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
@@ -14,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File: query-config
-# Purpose: Extracts field values a flat JSON file,
+# Purpose: Extracts field values from a flat JSON file,
 #          for use in languages that can't handle JSON easily,
 #          (I'm looking at you, Bourne shell!)