Merge lp:~ralsina/ubuntu-sso-client/find_exes into lp:ubuntu-sso-client

[Roberto Alsina]

- Added .exe to the constant for binary names if needed (LP: #958778)

fix paths and spawning on windows

[Manuel de la Peña (mandel)]

We should add tests fit this since we already had problems with get_bin due to the lack of tests. What about patching sys.platform and test the result?

Also, I think I'd a good idea to set the gtk one to none on windows to make the error more clear.

review: Needs Fixing

[Roberto Alsina (ralsina)]

> We should add tests fit this since we already had problems with get_bin due to
> the lack of tests. What about patching sys.platform and test the result?
>
> Also, I think I'd a good idea to set the gtk one to none on windows to make
> the error more clear.

This already had tests, I added them in a branch on friday.

The only functional change in this branch are the constants for binary names, the other is just a cosmetic fix.

[Natalia Bidart (nataliabidart)]

Looks good! Though I'm getting:

ubuntu_sso/__init__.py:
    42: [W0311] Bad indentation. Found 3 spaces, expected 4
    43: [W0311] Bad indentation. Found 3 spaces, expected 4

review: Needs Fixing

[Roberto Alsina (ralsina)]

> Looks good! Though I'm getting:
>
> ubuntu_sso/__init__.py:
> 42: [W0311] Bad indentation. Found 3 spaces, expected 4
> 43: [W0311] Bad indentation. Found 3 spaces, expected 4

Fixed in revno924, thanks!

[lp:~ralsina/ubuntu-sso-client/find_exes]

924. By Roberto Alsina on 2012-03-19

pep8 fix

[Brian Curtin (brian.curtin)]

looks good

review: Approve

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

[Manuel de la Peña (mandel)]

review: Approve

=== modified file 'ubuntu_sso/__init__.py'
--- ubuntu_sso/__init__.py	2012-03-08 12:35:25 +0000
+++ ubuntu_sso/__init__.py	2012-03-19 14:18:18 +0000
@@ -15,6 +15,8 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 """Ubuntu Single Sign On client code."""
 
+import sys
+
 # DBus constants
 DBUS_BUS_NAME = "com.ubuntu.sso"
 
@@ -35,3 +37,7 @@
 UI_EXECUTABLE_GTK = 'ubuntu-sso-login-gtk'
 UI_EXECUTABLE_QT = 'ubuntu-sso-login-qt'
 UI_PROXY_CREDS_DIALOG = 'ubuntu-sso-proxy-creds-qt'
+
+if getattr(sys, "frozen", None) is not None and sys.platform == "win32":
+    UI_EXECUTABLE_QT += ".exe"
+    UI_PROXY_CREDS_DIALOG += ".exe"
 
=== modified file 'ubuntu_sso/utils/__init__.py'
--- ubuntu_sso/utils/__init__.py	2012-03-16 22:33:29 +0000
+++ ubuntu_sso/utils/__init__.py	2012-03-19 14:18:18 +0000
@@ -96,12 +96,13 @@
     """
     # If sys is frozen, this is an .exe, and all binaries are in
     # the same place
-    if hasattr(sys, "frozen"):
+    if getattr(sys, "frozen", None) is not None:
         exec_path = os.path.abspath(sys.executable)
-        return os.path.dirname(exec_path)
-
-    result = _get_dir(dir_name=BIN_SUFFIX, dir_constant='BIN_DIR')
+        result = os.path.dirname(exec_path)
+    else:
+        result = _get_dir(dir_name=BIN_SUFFIX, dir_constant='BIN_DIR')
     assert result is not None, '%r dir can not be None.' % BIN_SUFFIX
+    logger.info('get_bin_dir: returning dir located at %r.', result)
     return result