|
 |
5424bf |
From 423ee853dfbb4ee9ed89a21e1cf2b6a928e2fc4d Mon Sep 17 00:00:00 2001
|
|
|
5424bf |
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
|
|
5424bf |
Date: Mon, 22 Apr 2013 16:40:51 +0000
|
|
|
5424bf |
Subject: Use GObject.__class__ instead of GObjectMeta
|
|
|
5424bf |
|
|
|
5424bf |
In pygobject 3.8, GObjectMeta is no longer available via
|
|
|
5424bf |
gi.repository.GObject. What we actually want is "the metaclass of
|
|
|
5424bf |
GObject", so, say so.
|
|
|
5424bf |
---
|
|
|
5424bf |
diff --git a/dbus/gi_service.py b/dbus/gi_service.py
|
|
|
5424bf |
index 924442f..2703289 100644
|
|
|
5424bf |
--- a/dbus/gi_service.py
|
|
|
5424bf |
+++ b/dbus/gi_service.py
|
|
|
5424bf |
@@ -37,12 +37,12 @@ import dbus.service
|
|
|
5424bf |
# `ExportedGObjectType` as its metaclass, which is sufficient to make it work
|
|
|
5424bf |
# correctly.
|
|
|
5424bf |
|
|
|
5424bf |
-class ExportedGObjectType(GObject.GObjectMeta, dbus.service.InterfaceType):
|
|
|
5424bf |
+class ExportedGObjectType(GObject.GObject.__class__, dbus.service.InterfaceType):
|
|
|
5424bf |
"""A metaclass which inherits from both GObjectMeta and
|
|
|
5424bf |
`dbus.service.InterfaceType`. Used as the metaclass for `ExportedGObject`.
|
|
|
5424bf |
"""
|
|
|
5424bf |
def __init__(cls, name, bases, dct):
|
|
|
5424bf |
- GObject.GObjectMeta.__init__(cls, name, bases, dct)
|
|
|
5424bf |
+ GObject.GObject.__class__.__init__(cls, name, bases, dct)
|
|
|
5424bf |
dbus.service.InterfaceType.__init__(cls, name, bases, dct)
|
|
|
5424bf |
|
|
|
5424bf |
|
|
|
5424bf |
diff --git a/dbus/gobject_service.py b/dbus/gobject_service.py
|
|
|
5424bf |
index 1c96546..ef16009 100644
|
|
|
5424bf |
--- a/dbus/gobject_service.py
|
|
|
5424bf |
+++ b/dbus/gobject_service.py
|
|
|
5424bf |
@@ -40,12 +40,12 @@ else:
|
|
|
5424bf |
|
|
|
5424bf |
import dbus.service
|
|
|
5424bf |
|
|
|
5424bf |
-class ExportedGObjectType(gobject.GObjectMeta, dbus.service.InterfaceType):
|
|
|
5424bf |
+class ExportedGObjectType(gobject.GObject.__class__, dbus.service.InterfaceType):
|
|
|
5424bf |
"""A metaclass which inherits from both GObjectMeta and
|
|
|
5424bf |
`dbus.service.InterfaceType`. Used as the metaclass for `ExportedGObject`.
|
|
|
5424bf |
"""
|
|
|
5424bf |
def __init__(cls, name, bases, dct):
|
|
|
5424bf |
- gobject.GObjectMeta.__init__(cls, name, bases, dct)
|
|
|
5424bf |
+ gobject.GObject.__class__.__init__(cls, name, bases, dct)
|
|
|
5424bf |
dbus.service.InterfaceType.__init__(cls, name, bases, dct)
|
|
|
5424bf |
|
|
|
5424bf |
class ExportedGObject(gobject.GObject, dbus.service.Object):
|
|
|
5424bf |
--
|
|
|
5424bf |
cgit v0.9.0.2-2-gbebe
|