Merge lp:~mfisch/singlet/fix_deprecation_warning into lp:singlet

Proposed by Matt Fischer on 2012-12-11
Status: Merged
Approved by: Michael Hall on 2012-12-13
Approved revision: 23
Merged at revision: 23
Proposed branch: lp:~mfisch/singlet/fix_deprecation_warning
Merge into: lp:singlet
Diff against target: 31 lines (+3/-6)
1 file modified
src/singlet/utils.py (+3/-6)
To merge this branch: bzr merge lp:~mfisch/singlet/fix_deprecation_warning
Reviewer Review Type Date Requested Status
Michael Hall 2012-12-11 Pending
Review via email: mp+139301@code.launchpad.net

Description of the change

Fixed the deprecated code warnings you get in raring. Also works fine in Q, have not tested in P.

To post a comment you must log in.
Matt Fischer (mfisch) wrote :

Also I removed some unused imports which may reduce memory usage?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/singlet/utils.py'
2--- src/singlet/utils.py 2012-03-14 15:34:12 +0000
3+++ src/singlet/utils.py 2012-12-11 19:43:22 +0000
4@@ -17,11 +17,8 @@
5 # along with this program. If not, see <http://www.gnu.org/licenses/>.
6
7 import sys
8-import os
9-import shutil
10-import subprocess
11
12-from gi.repository import GLib, GObject, Gio
13+from gi.repository import GLib, Gio
14
15 import singlet
16
17@@ -43,7 +40,7 @@
18 raise SystemExit (1)
19
20 lens = lens_class()
21- GObject.MainLoop().run()
22+ GLib.MainLoop().run()
23
24 def run_scope(scope_class, args=None):
25 session_bus_connection = Gio.bus_get_sync (Gio.BusType.SESSION, None)
26@@ -63,4 +60,4 @@
27 raise SystemExit (1)
28
29 scope = scope_class()
30- GObject.MainLoop().run()
31+ GLib.MainLoop().run()

Subscribers

People subscribed via source and target branches