From 605f5f4c7395cd4ef93a3ffb23f5cbc5f1ec3a5e Mon Sep 17 00:00:00 2001
From: "Manuel Amador (Rudd-O)" <rudd-o@rudd-o.com>
Date: Tue, 14 Apr 2020 01:47:04 +0000
Subject: [PATCH] Update to Python 3.

---
 qubes-network-server.spec | 9 ++++-----
 src/qubes-routing-manager | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/qubes-network-server.spec b/qubes-network-server.spec
index 76bfc74..17b4957 100644
--- a/qubes-network-server.spec
+++ b/qubes-network-server.spec
@@ -5,7 +5,7 @@
 %define mybuildnumber %{?build_number}%{?!build_number:1}
 
 Name:           qubes-network-server
-Version:        0.0.11
+Version:        0.0.12
 Release:        %{mybuildnumber}%{?dist}
 Summary:        Turn your Qubes OS into a network server
 BuildArch:      noarch
@@ -22,10 +22,9 @@ BuildRequires:  findutils
 BuildRequires:  systemd
 BuildRequires:  systemd-rpm-macros
 
-Requires:       qubes-core-agent-networking >= 4.0.51-1
-Requires:       qubes-core-agent-networking < 4.1
-Requires:       python2
-Requires:       python2-qubesdb
+Requires:       qubes-core-agent-networking >= 4.1
+Requires:       python3
+Requires:       python3-qubesdb
 
 %description
 This package lets you turn your Qubes OS into a network server.
diff --git a/src/qubes-routing-manager b/src/qubes-routing-manager
index 79e31f3..26e0701 100755
--- a/src/qubes-routing-manager
+++ b/src/qubes-routing-manager
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 
 '''
 This program reads the /qubes-firewall/{ip}/qubes-routing-method file
@@ -42,7 +42,7 @@ class AdjunctWorker(object):
         def run_ipt(*args):
             return subprocess.check_call([cmd, '-w'] + list(args))
 
-        out = subprocess.check_output([cmd + '-save']).splitlines()
+        out = subprocess.check_output([cmd + '-save', '-w'], universal_newlines=True).splitlines()
 
         if enable:
             # Create necessary prerouting chain.