Switch to python3

QubesOS · May 19, 2017 · 737ffc0 · 737ffc0
1 parent cd8393d
commit 737ffc0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/dbus-1/services/org.qubes.DomainManager1.service b/dbus-1/services/org.qubes.DomainManager1.service
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.qubes.DomainManager1
-Exec=/usr/bin/python /usr/lib/python2.7/site-packages/qubesdbus/domain_manager.py
+Exec=/usr/bin/python3 -m qubesdbus.domain_manager
diff --git a/dbus-1/services/org.qubes.Labels1.service b/dbus-1/services/org.qubes.Labels1.service
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.qubes.Labels1
-Exec=/usr/bin/python /usr/lib/python2.7/site-packages/qubesdbus/labels.py
+Exec=/usr/bin/python3 -m qubesdbus.labels
diff --git a/qubesdbus/service.py b/qubesdbus/service.py
@@ -67,8 +67,7 @@ def __init__(self, bus=None, bus_name=None, bus_path=None):
             _name = ''.join([NAME_PREFIX, '.', self.__class__.__name__,
                              str(VERSION)])
             self.bus_name = dbus.service.BusName(_name, self.bus)
-    # avoid pylint super-on-old-class error
-        dbus.service.Object.__init__(self, self.bus_name, self.bus_path)
+        super(DbusServiceObject, self).__init__(self.bus_name, self.bus_path)
 
 
 class ObjectManager(DbusServiceObject):

diff --git a/rpm_spec/qubes-dbus.spec b/rpm_spec/qubes-dbus.spec
@@ -31,7 +31,8 @@ Vendor:		Invisible Things Lab
 License:    GPL2+
 URL:		http://www.qubes-os.org
 
-Requires: python-dbus
+Requires: python3-dbus
+Requires: python3-systemd
 
 %define _builddir %(pwd)
 
@@ -44,11 +45,11 @@ ln -sf . %{name}-%{version}
 foo bar
 
 %build
-/usr/bin/python setup.py build
+/usr/bin/python3 setup.py build
 
 %install
 
-python setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
+python3 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
 mkdir -p $RPM_BUILD_ROOT/usr/share
 cp -r dbus-1 $RPM_BUILD_ROOT/usr/share/dbus-1