Switch to Python 3

QubesOS/qubes-issues#5297 QubesOS/qubes-issues#5529
marmarek · Dec 19, 2019 · 0987924 · 0987924
1 parent 59d29eb
commit 0987924
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -49,7 +49,7 @@ install-vm:
 
 .PHONY: install-dom0
 install-dom0:
-	python2 setup.py install -O1 --root $(DESTDIR)
+	python3 setup.py install -O1 --root $(DESTDIR)
 	make install -C doc
 
 .PHONY: get-sources

diff --git a/debian/control b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Jason Mehring <nrgaway@gmail.com>
 Build-Depends: 
     debhelper (>= 9~),
     quilt,
-    python-yaml,
+    python3-yaml,
     tree
 Standards-Version: 3.9.5
 Homepage: http://www.qubes-os.org

diff --git a/qubesctl b/qubesctl
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 '''
 Directly call a salt command in the modules, does not require a running salt
 minion to run.

diff --git a/qubessalt/__init__.py b/qubessalt/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python2
 # coding=utf-8
 #
 # The Qubes OS Project, http://www.qubes-os.org
@@ -90,7 +89,7 @@ def prepare_salt_config_for_vm(self):
                 '--id={}'.format(self.vm.name), '--output=yaml',
                 'pillar.items'], stdout=subprocess.PIPE)
         (pillar_items_output, _) = p.communicate()
-        pillar_data = yaml.safe_load(pillar_items_output)
+        pillar_data = yaml.safe_load(pillar_items_output.decode())
         pillar_data = pillar_data['local']
         # remove source pillar files
         # TODO: remove also pillar modules

diff --git a/rpm_spec/qubes-mgmt-salt-dom0.spec.in b/rpm_spec/qubes-mgmt-salt-dom0.spec.in
@@ -12,7 +12,7 @@ Requires:  qubes-mgmt-salt
 Requires:  qubes-mgmt-salt-dom0-qvm
 Requires:  qubes-mgmt-salt-dom0-update
 Requires:  qubes-mgmt-salt-dom0-virtual-machines
-BuildRequires: PyYAML
+BuildRequires: python3-pyyaml
 BuildRequires: tree
 Conflicts:  qubes-mgmt-salt-vm
 

diff --git a/rpm_spec/qubes-mgmt-salt-vm.spec.in b/rpm_spec/qubes-mgmt-salt-vm.spec.in
@@ -9,7 +9,7 @@ URL:	   http://www.qubes-os.org/
 Group:     System administration tools
 BuildArch: noarch
 Requires:  qubes-mgmt-salt
-BuildRequires: PyYAML
+BuildRequires: python3-pyyaml
 BuildRequires: tree
 Requires(post): /usr/bin/qubesctl
 Conflicts:  qubes-mgmt-salt-dom0

diff --git a/rpm_spec/qubes-mgmt-salt.spec.in b/rpm_spec/qubes-mgmt-salt.spec.in
@@ -10,11 +10,11 @@ BuildArch: noarch
 Requires:  salt >= 2015.5
 Requires:  salt-minion
 Requires:  qubes-mgmt-salt-base
-BuildRequires: PyYAML
+BuildRequires: python3-pyyaml
 BuildRequires: tree
 BuildRequires: pandoc
-BuildRequires: python-setuptools
-BuildRequires: python2-devel
+BuildRequires: python3-setuptools
+BuildRequires: python3-devel
 
 Source0: %{name}-%{version}.tar.gz
 
@@ -45,7 +45,7 @@ Group:     System administration tools
 Requires:  salt
 Requires:  salt-minion
 Conflicts:  qubes-mgmt-salt-base-top < 4.1.0
-BuildRequires: PyYAML
+BuildRequires: python3-pyyaml
 BuildArch: noarch
 
 %description config
@@ -108,10 +108,11 @@ rm -rf %{buildroot}/srv/formulas/.gitignore
 
 %files admin-tools
 /usr/bin/qubesctl
-%dir %{python2_sitelib}/qubessalt-*egg-info
-%{python2_sitelib}/qubessalt-*egg-info/*
-%dir %{python2_sitelib}/qubessalt
-%{python2_sitelib}/qubessalt/__init__.py*
+%dir %{python3_sitelib}/qubessalt-*egg-info
+%{python3_sitelib}/qubessalt-*egg-info/*
+%dir %{python3_sitelib}/qubessalt
+%{python3_sitelib}/qubessalt/__init__.py*
+%{python3_sitelib}/qubessalt/__pycache__/*
 
 
 %files shared-formulas

diff --git a/yaml-dumper b/yaml-dumper
@@ -1,4 +1,4 @@
-#!/usr/bin/python2 -O
+#!/usr/bin/python3 -O
 # -*- coding: utf-8 -*-`
 #
 # vim: set ts=4 sw=4 sts=4 et :