Merge lp:~mikemc/ubuntu-sso-client/fix-1012837-raise-and-shine into lp:ubuntu-sso-client

[Mike McCracken]

- correctly bring main sso client window to the front on mac os x ( LP:1012837 )

- correctly bring main sso client window to the front on mac os x ( LP:1012837 )

[lp:~mikemc/ubuntu-sso-client/fix-1012837-raise-and-shine]

969. By Mike McCracken on 2012-06-13

style change and add raise_ to mock ui object so tests pass.

970. By Mike McCracken on 2012-06-13

fix pep8 complaint

[Mike McCracken (mikemc)]

As of r970, tests pass on osx and linux and pylint and pep8 are happy.
mea culpa

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'ubuntu_sso/qt/main/__init__.py'
--- ubuntu_sso/qt/main/__init__.py	2012-05-09 18:00:22 +0000
+++ ubuntu_sso/qt/main/__init__.py	2012-06-13 21:57:21 +0000
@@ -80,5 +80,7 @@
                     ui.size(), app.desktop().availableGeometry())
     ui.setGeometry(style)
     ui.show()
+    if sys.platform == 'darwin':
+        ui.raise_()
 
     source.main_start(app)

=== modified file 'ubuntu_sso/qt/main/tests/test_main.py'
--- ubuntu_sso/qt/main/tests/test_main.py	2012-05-09 17:48:32 +0000
+++ ubuntu_sso/qt/main/tests/test_main.py	2012-06-13 21:57:21 +0000
@@ -53,6 +53,7 @@
         """Fake setGeometry."""
 
     show = setGeometry
+    raise_ = lambda self: None
 
 
 class FakeDesktop(object):