← Back to branch summary

~dobey/ubuntuone-client/transient-notify

« back to all changes in this revision

Viewing changes to ubuntuone/platform/linux/os_helper.py

  • Committer: Tarmac
  • Author(s): Rodney Dawes
  • Date: 2012-02-06 16:40:04 UTC
  • mfrom: (1182.1.11 gi-support)
  • Revision ID: tarmac-20120206164004-7l3krm2rkc7m8c30
Remove the old, broken, and unused sdreactor code
Try the new gireactor first, and fall back to the old glib2reactor, when running scripts
Update code and tests to work correctly under either glib2reactor or gireactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/platform/linux/os_helper.py
29
29
import stat
30
30
import sys
31
31
 
32
 
if 'gobject' in sys.modules:
 
32
if 'gobject' in sys.modules and sys.modules['gobject'] is not None:
33
33
    import gio
34
34
    has_gi = False
35
35
else: