Merge lp:~dobey/ubuntuone-dev-tools/gi-glib-fallback into lp:ubuntuone-dev-tools

[dobey]

Fall back to the gtk2/glib2 reactors if gtk3/gi reactors aren't available
Default to using gi reactor in u1trial

[lp:~dobey/ubuntuone-dev-tools/gi-glib-fallback]

68. By dobey on 2012-04-25

Remove the absolute_import import

[Alejandro J. Cura (alecu)]

Code looks good; all tests pass on both Oneiric and Precise.

review: Approve

[Brian Curtin (brian.curtin)]

Looks good.

You need to change this, but you have Python 3-like print usage in there, although it's just passing a single tuple to the print statement.

review: Approve

[dobey (dobey)]

> You need to change this, but you have Python 3-like print usage in there,
> although it's just passing a single tuple to the print statement.

As we will be needing to support Python 3 for 12.10 as best we can, I thought it best to start using the print statement as a function, as is required in Python 3, even though I did not add the __future__ import to enforce it. I suspect we'll need to get several of our lower level projects working with Python 3 soon.

=== modified file 'bin/u1trial'
--- bin/u1trial	2012-03-30 17:44:03 +0000
+++ bin/u1trial	2012-04-25 20:31:18 +0000
@@ -236,7 +236,7 @@
                      ["loop", None, 1],
                      ["ignore-modules", "i", ""],
                      ["ignore-paths", "p", ""],
-                     ["reactor", "r", "glib"],
+                     ["reactor", "r", "gi"],
                      ]
 
     def __init__(self):

=== modified file 'ubuntuone/devtools/reactors/gi.py'
--- ubuntuone/devtools/reactors/gi.py	2012-03-30 17:44:03 +0000
+++ ubuntuone/devtools/reactors/gi.py	2012-04-25 20:31:18 +0000
@@ -29,13 +29,25 @@
 REACTOR_URL = 'http://twistedmatrix.com/trac/ticket/4558'
 
 
+def load_reactor(reactor_name=None):
+    """Load the reactor module and return it."""
+    return __import__(reactor_name, None, None, [''])
+
+
 def install(options=None):
     """Install the reactor and parse any options we might need."""
-    reactor_name = None
+    reactor = None
     if options is not None and options['gui']:
-        reactor_name = 'twisted.internet.gtk3reactor'
+        try:
+            reactor = load_reactor('twisted.internet.gtk3reactor')
+        except ImportError:
+            print('Falling back to gtk2reactor module.')
+            reactor = load_reactor('twisted.internet.gtk2reactor')
     else:
-        reactor_name = 'twisted.internet.gireactor'
+        try:
+            reactor = load_reactor('twisted.internet.gireactor')
+        except ImportError:
+            print('Falling back to glib2reactor module.')
+            reactor = load_reactor('twisted.internet.glib2reactor')
 
-    glibreactor = __import__(reactor_name, None, None, [''])
-    glibreactor.install()
+    reactor.install()