diff mbox series

dbus: Use GLib.MainLoop()

Message ID 20210728165922.186631-1-plautrba@redhat.com (mailing list archive)
State Accepted
Headers show
Series dbus: Use GLib.MainLoop() | expand

Commit Message

Petr Lautrbach July 28, 2021, 4:59 p.m. UTC 
Fixes:
    PyGIDeprecationWarning: GObject.MainLoop is deprecated; use GLib.MainLoop instead

Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
---
 dbus/selinux_server.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Comments

James Carter July 30, 2021, 2:22 p.m. UTC | #1 
On Wed, Jul 28, 2021 at 12:59 PM Petr Lautrbach <plautrba@redhat.com> wrote:
>
> Fixes:
>     PyGIDeprecationWarning: GObject.MainLoop is deprecated; use GLib.MainLoop instead
>
> Signed-off-by: Petr Lautrbach <plautrba@redhat.com>

In trying to test this, selinux_server.py seems to work and be waiting
to respond, but selinux_client.py just immediately exits with the
error "org.freedesktop.PolicyKit1.Error.Failed: Action
org.selinux.customized is not registered". I am probably doing
something wrong.

At any rate, this definitely fixes the error.

Acked-by: James Carter <jwcart2@gmail.com>

> ---
>  dbus/selinux_server.py | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/dbus/selinux_server.py b/dbus/selinux_server.py
> index b7c9378bcb5d..a969f2268ceb 100644
> --- a/dbus/selinux_server.py
> +++ b/dbus/selinux_server.py
> @@ -2,8 +2,9 @@
>
>  import dbus
>  import dbus.service
> -import dbus.mainloop.glib
> +from dbus.mainloop.glib import DBusGMainLoop
>  from gi.repository import GObject
> +from gi.repository import GLib
>  import os
>  import selinux
>  from subprocess import Popen, PIPE, STDOUT
> @@ -145,9 +146,10 @@ class selinux_server(dbus.service.Object):
>          raise ValueError("%s does not exist" % path)
>
>  if __name__ == "__main__":
> -    mainloop = GObject.MainLoop()
> -    dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
> +    DBusGMainLoop(set_as_default=True)
> +    mainloop = GLib.MainLoop()
> +
>      system_bus = dbus.SystemBus()
>      name = dbus.service.BusName("org.selinux", system_bus)
> -    object = selinux_server(system_bus, "/org/selinux/object")
> +    server = selinux_server(system_bus, "/org/selinux/object")
>      mainloop.run()
> --
> 2.32.0
>
James Carter Aug. 3, 2021, 2:04 p.m. UTC | #2 
On Fri, Jul 30, 2021 at 10:22 AM James Carter <jwcart2@gmail.com> wrote:
>
> On Wed, Jul 28, 2021 at 12:59 PM Petr Lautrbach <plautrba@redhat.com> wrote:
> >
> > Fixes:
> >     PyGIDeprecationWarning: GObject.MainLoop is deprecated; use GLib.MainLoop instead
> >
> > Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
>
> In trying to test this, selinux_server.py seems to work and be waiting
> to respond, but selinux_client.py just immediately exits with the
> error "org.freedesktop.PolicyKit1.Error.Failed: Action
> org.selinux.customized is not registered". I am probably doing
> something wrong.
>
> At any rate, this definitely fixes the error.
>
> Acked-by: James Carter <jwcart2@gmail.com>
>

Merged.
Thanks,
Jim

> > ---
> >  dbus/selinux_server.py | 10 ++++++----
> >  1 file changed, 6 insertions(+), 4 deletions(-)
> >
> > diff --git a/dbus/selinux_server.py b/dbus/selinux_server.py
> > index b7c9378bcb5d..a969f2268ceb 100644
> > --- a/dbus/selinux_server.py
> > +++ b/dbus/selinux_server.py
> > @@ -2,8 +2,9 @@
> >
> >  import dbus
> >  import dbus.service
> > -import dbus.mainloop.glib
> > +from dbus.mainloop.glib import DBusGMainLoop
> >  from gi.repository import GObject
> > +from gi.repository import GLib
> >  import os
> >  import selinux
> >  from subprocess import Popen, PIPE, STDOUT
> > @@ -145,9 +146,10 @@ class selinux_server(dbus.service.Object):
> >          raise ValueError("%s does not exist" % path)
> >
> >  if __name__ == "__main__":
> > -    mainloop = GObject.MainLoop()
> > -    dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
> > +    DBusGMainLoop(set_as_default=True)
> > +    mainloop = GLib.MainLoop()
> > +
> >      system_bus = dbus.SystemBus()
> >      name = dbus.service.BusName("org.selinux", system_bus)
> > -    object = selinux_server(system_bus, "/org/selinux/object")
> > +    server = selinux_server(system_bus, "/org/selinux/object")
> >      mainloop.run()
> > --
> > 2.32.0
> >
diff mbox series

Patch

diff --git a/dbus/selinux_server.py b/dbus/selinux_server.py
index b7c9378bcb5d..a969f2268ceb 100644
--- a/dbus/selinux_server.py
+++ b/dbus/selinux_server.py
@@ -2,8 +2,9 @@ 
 
 import dbus
 import dbus.service
-import dbus.mainloop.glib
+from dbus.mainloop.glib import DBusGMainLoop
 from gi.repository import GObject
+from gi.repository import GLib
 import os
 import selinux
 from subprocess import Popen, PIPE, STDOUT
@@ -145,9 +146,10 @@  class selinux_server(dbus.service.Object):
         raise ValueError("%s does not exist" % path)
 
 if __name__ == "__main__":
-    mainloop = GObject.MainLoop()
-    dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+    DBusGMainLoop(set_as_default=True)
+    mainloop = GLib.MainLoop()
+
     system_bus = dbus.SystemBus()
     name = dbus.service.BusName("org.selinux", system_bus)
-    object = selinux_server(system_bus, "/org/selinux/object")
+    server = selinux_server(system_bus, "/org/selinux/object")
     mainloop.run()