Merge lp:~mikemc/ubuntuone-control-panel/fix-1012887-controlpanel-darwin into lp:ubuntuone-control-panel

[Mike McCracken]

- use twisted reactor main loop on darwin as on windows (lp:1012887)

- use twisted reactor main loop on darwin as on windows (lp:1012887)

also renames modules because darwin and windows both use the former 'windows.py'.

[lp:~mikemc/ubuntuone-control-panel/fix-1012887-controlpanel-darwin]

334. By Mike McCracken on 2012-06-15

cleanup branch: remove call to raise_(), saved for another branch

335. By Mike McCracken on 2012-06-15

finish cleanup of raise_ changes

[Alejandro J. Cura (alecu)]

+1, tests pass on linux

review: Approve

=== modified file 'ubuntuone/controlpanel/gui/qt/main/__init__.py'
--- ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-05-14 22:27:07 +0000
+++ ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-06-15 22:26:18 +0000
@@ -29,12 +29,12 @@
 from ubuntuone.controlpanel.gui.qt.uniqueapp import UniqueApplication
 
 # Invalid name "source", pylint: disable=C0103
-if sys.platform == 'win32':
-    from ubuntuone.controlpanel.gui.qt.main import windows
-    source = windows
+if sys.platform in ('win32', 'darwin'):
+    from ubuntuone.controlpanel.gui.qt.main import twisted_main
+    source = twisted_main
 else:
-    from ubuntuone.controlpanel.gui.qt.main import linux
-    source = linux
+    from ubuntuone.controlpanel.gui.qt.main import dbus_main
+    source = dbus_main
 # pylint: enable=C0103
 
 

=== renamed file 'ubuntuone/controlpanel/gui/qt/main/linux.py' => 'ubuntuone/controlpanel/gui/qt/main/dbus_main.py'
=== renamed file 'ubuntuone/controlpanel/gui/qt/main/windows.py' => 'ubuntuone/controlpanel/gui/qt/main/twisted_main.py'
--- ubuntuone/controlpanel/gui/qt/main/windows.py	2012-04-05 14:52:55 +0000
+++ ubuntuone/controlpanel/gui/qt/main/twisted_main.py	2012-06-15 22:26:18 +0000
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Main method to be used on windows."""
+"""Main method to be used on platforms without dbus."""
 
 from PyQt4 import QtGui