From df76a14752e2d900a22be7c6e60e5d1ebf16bcd7 Mon Sep 17 00:00:00 2001 From: "J. Nathanael Philipp" Date: Fri, 15 Nov 2019 11:39:40 +0100 Subject: [PATCH] Fix dbus.glib deprecation warning. Minor styling improvements. --- gnome-pass-search-provider.py | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/gnome-pass-search-provider.py b/gnome-pass-search-provider.py index f880c91..674aace 100755 --- a/gnome-pass-search-provider.py +++ b/gnome-pass-search-provider.py @@ -26,17 +26,16 @@ # Author: Luke Macken import dbus -import dbus.glib import dbus.service import re import subprocess +from dbus.mainloop.glib import DBusGMainLoop +from fuzzywuzzy import process, fuzz +from gi.repository import GLib from os import getenv, walk from os.path import expanduser, join as path_join -from gi.repository import GLib -from fuzzywuzzy import process, fuzz - # Convenience shorthand for declaring dbus interface methods. # s.b.n. -> search_bus_name search_bus_name = 'org.gnome.Shell.SearchProvider2' @@ -122,7 +121,7 @@ class SearchPassService(dbus.service.Object): universal_newlines=True) if field is not None: match = re.search(fr'^{field}:\s*(?P.+?)$', output, - flags=re.I|re.M) + flags=re.I | re.M) if match: password = match.group('value') else: @@ -198,14 +197,10 @@ class SearchPassService(dbus.service.Object): dbus_interface='org.freedesktop.Notifications' ) except dbus.DBusException as err: - print('Got error {} while trying to display message {}.'.format( - err, message)) - - -def main(): - SearchPassService() - GLib.MainLoop().run() + print(f'Error {err} while trying to display {message}.') if __name__ == '__main__': - main() + DBusGMainLoop(set_as_default=True) + SearchPassService() + GLib.MainLoop().run()