Merge lp:~robru/friends/drop-threads-init into lp:friends

Proposed by Robert Bruce Park
Status: Merged
Approved by: Robert Bruce Park
Approved revision: 208
Merged at revision: 210
Proposed branch: lp:~robru/friends/drop-threads-init
Merge into: lp:friends
Diff against target: 41 lines (+2/-9)
2 files modified
friends/main.py (+1/-5)
friends/utils/authentication.py (+1/-4)
To merge this branch: bzr merge lp:~robru/friends/drop-threads-init
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Ken VanDine Pending
Review via email: mp+170222@code.launchpad.net

Commit message

Stop calling deprecated GObject.threads_init()

Description of the change

Fix for the recent PyGIDeprecationWarnings.

See https://bugzilla.gnome.org/show_bug.cgi?id=686914

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:208
http://jenkins.qa.ubuntu.com/job/friends-ci/47/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-saucy-amd64-ci/4

Click here to trigger a rebuild:
http://s-jenkins:8080/job/friends-ci/47/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'friends/main.py'
--- friends/main.py 2013-05-07 00:40:15 +0000
+++ friends/main.py 2013-06-18 23:35:31 +0000
@@ -31,7 +31,7 @@
3131
32# Set up the DBus main loop.32# Set up the DBus main loop.
33from dbus.mainloop.glib import DBusGMainLoop33from dbus.mainloop.glib import DBusGMainLoop
34from gi.repository import GLib34from gi.repository import GLib, Gio
3535
36DBusGMainLoop(set_as_default=True)36DBusGMainLoop(set_as_default=True)
37loop = GLib.MainLoop()37loop = GLib.MainLoop()
@@ -56,10 +56,6 @@
5656
5757
58# Continue with normal loading...58# Continue with normal loading...
59from gi.repository import Gio, GObject
60
61GObject.threads_init()
62
63from friends.service.dispatcher import Dispatcher, DBUS_INTERFACE59from friends.service.dispatcher import Dispatcher, DBUS_INTERFACE
64from friends.utils.base import Base, initialize_caches, _publish_lock60from friends.utils.base import Base, initialize_caches, _publish_lock
65from friends.utils.model import Model, prune_model61from friends.utils.model import Model, prune_model
6662
=== modified file 'friends/utils/authentication.py'
--- friends/utils/authentication.py 2013-05-07 00:40:15 +0000
+++ friends/utils/authentication.py 2013-06-18 23:35:31 +0000
@@ -23,14 +23,11 @@
23import logging23import logging
24import time24import time
2525
26from gi.repository import GObject, Accounts, Signon26from gi.repository import Accounts, Signon
2727
28from friends.errors import AuthorizationError28from friends.errors import AuthorizationError
2929
3030
31GObject.threads_init()
32
33
34log = logging.getLogger(__name__)31log = logging.getLogger(__name__)
3532
3633

Subscribers

People subscribed via source and target branches