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
1=== modified file 'friends/main.py'
2--- friends/main.py 2013-05-07 00:40:15 +0000
3+++ friends/main.py 2013-06-18 23:35:31 +0000
4@@ -31,7 +31,7 @@
5
6 # Set up the DBus main loop.
7 from dbus.mainloop.glib import DBusGMainLoop
8-from gi.repository import GLib
9+from gi.repository import GLib, Gio
10
11 DBusGMainLoop(set_as_default=True)
12 loop = GLib.MainLoop()
13@@ -56,10 +56,6 @@
14
15
16 # Continue with normal loading...
17-from gi.repository import Gio, GObject
18-
19-GObject.threads_init()
20-
21 from friends.service.dispatcher import Dispatcher, DBUS_INTERFACE
22 from friends.utils.base import Base, initialize_caches, _publish_lock
23 from friends.utils.model import Model, prune_model
24
25=== modified file 'friends/utils/authentication.py'
26--- friends/utils/authentication.py 2013-05-07 00:40:15 +0000
27+++ friends/utils/authentication.py 2013-06-18 23:35:31 +0000
28@@ -23,14 +23,11 @@
29 import logging
30 import time
31
32-from gi.repository import GObject, Accounts, Signon
33+from gi.repository import Accounts, Signon
34
35 from friends.errors import AuthorizationError
36
37
38-GObject.threads_init()
39-
40-
41 log = logging.getLogger(__name__)
42
43

Subscribers

People subscribed via source and target branches