Reinstate the old dbus.gobject_service, but only for Python 2

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=48904

3 files changed, 82 insertions, 0 deletions

diff --git a/Makefile.am b/Makefile.am
index f244061..ebc2e43 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,6 +37,12 @@ nobase_python_PYTHON = \
     dbus/service.py \
     dbus/types.py
 
+if !HAVE_PYTHON_3
+nobase_python_PYTHON += \
+    dbus/gobject_service.py \
+    $(NULL)
+endif
+
 check_py_sources = $(nobase_python_PYTHON)
 include $(top_srcdir)/tools/check-coding-style.mk
 
diff --git a/configure.ac b/configure.ac
index a1f9383..1f4548c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +50,11 @@ AM_PATH_PYTHON([2.6])
 
 AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
 
+# This command exits 0 (success) if sys.version >= "3", or 1 (failure)
+# if sys.version < "3" (i.e. starts with "2").
+AM_CONDITIONAL([HAVE_PYTHON_3],
+  [$PYTHON -c "import sys; sys.exit(sys.version < '3')"])
+
 PLATFORM=`$PYTHON -c "from __future__ import print_function; from distutils import util; print(util.get_platform())"`
 AC_SUBST(PLATFORM)
 
diff --git a/dbus/gobject_service.py b/dbus/gobject_service.py
new file mode 100644
index 0000000..61a7749
--- /dev/null
+++ b/dbus/gobject_service.py
@@ -0,0 +1,71 @@
+"""Support code for implementing D-Bus services via GObjects."""
+
+# Copyright (C) 2007 Collabora Ltd. <http://www.collabora.co.uk/>
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use, copy,
+# modify, merge, publish, distribute, sublicense, and/or sell copies
+# of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+import gobject
+import dbus.service
+
+class ExportedGObjectType(gobject.GObjectMeta, dbus.service.InterfaceType):
+    """A metaclass which inherits from both GObjectMeta and
+    `dbus.service.InterfaceType`. Used as the metaclass for `ExportedGObject`.
+    """
+    def __init__(cls, name, bases, dct):
+        gobject.GObjectMeta.__init__(cls, name, bases, dct)
+        dbus.service.InterfaceType.__init__(cls, name, bases, dct)
+
+class ExportedGObject(gobject.GObject, dbus.service.Object):
+    """A GObject which is exported on the D-Bus.
+
+    Because GObject and `dbus.service.Object` both have custom metaclasses,
+    the naive approach using simple multiple inheritance won't work. This
+    class has `ExportedGObjectType` as its metaclass, which is sufficient
+    to make it work correctly.
+    """
+    __metaclass__ = ExportedGObjectType
+
+    def __init__(self, conn=None, object_path=None, **kwargs):
+        """Initialize an exported GObject.
+
+        :Parameters:
+            `conn` : dbus.connection.Connection
+                The D-Bus connection or bus
+            `object_path` : str
+                The object path at which to register this object.
+        :Keywords:
+            `bus_name` : dbus.service.BusName
+                A bus name to be held on behalf of this object, or None.
+            `gobject_properties` : dict
+                GObject properties to be set on the constructed object.
+
+                Any unrecognised keyword arguments will also be interpreted
+                as GObject properties.
+            """
+        bus_name = kwargs.pop('bus_name', None)
+        gobject_properties = kwargs.pop('gobject_properties', None)
+
+        if gobject_properties is not None:
+            kwargs.update(gobject_properties)
+        gobject.GObject.__init__(self, **kwargs)
+        dbus.service.Object.__init__(self, conn=conn,
+                                     object_path=object_path,
+                                     bus_name=bus_name)