Ubuntu Single Sign On Client

Merge lp:~mikemc/ubuntu-sso-client/use-dirspec-get-program-path into lp:ubuntu-sso-client

use-dirspec-get-program-path
Merge into trunk

Proposed by Mike McCracken on 2012-07-12

Status:

Merged

Approved by:

Mike McCracken on 2012-07-17

Approved revision:

994

Merged at revision:

986

Proposed branch:

lp:~mikemc/ubuntu-sso-client/use-dirspec-get-program-path

Merge into:

lp:ubuntu-sso-client

Diff against target:

509 lines (+80/-138)

10 files modified

ubuntu_sso/__init__.py (+3/-6)
ubuntu_sso/credentials.py (+9/-13)
ubuntu_sso/main/__init__.py (+0/-2)
ubuntu_sso/main/darwin.py (+3/-17)
ubuntu_sso/main/tests/test_windows.py (+0/-18)
ubuntu_sso/main/windows.py (+3/-14)
ubuntu_sso/tests/test_credentials.py (+18/-37)
ubuntu_sso/utils/__init__.py (+29/-7)
ubuntu_sso/utils/tests/test_common.py (+1/-10)
ubuntu_sso/utils/webclient/common.py (+14/-14)

To merge this branch:

bzr merge lp:~mikemc/ubuntu-sso-client/use-dirspec-get-program-path

Related bugs:

Bug #992593: SSO backend command on darwin is not correctly provided for tcpactivation	Medium	Fix Released
Bug #1018924: Scripts are not ran because the shebang points to the wrong path	Critical	Fix Released
Bug #1019123: utils.get_bin_dir doesn't know about darwin package layout	High	Fix Released

Link a bug report

Reviewer	Date Requested	Status
dobey (community)		Approve on 2012-07-17
Brian Curtin (community)	2012-07-12	Approve on 2012-07-12
Review via email: mp+114690@code.launchpad.net

Commit Message

- Use dirspec get_program_path for cross-platform executable path finding.

Description of the Change

- Use dirspec get_program_path for cross-platform executable path finding.

Adds support for darwin packaged paths, and changes packaged windows to always use sys.executable-relative paths, instead of sometimes using paths from the registry and sometimes using executable.

NOTE: to test, needs current trunk of dirspec. On mac and windows, I just moved the dirspec in the buildout eggs/ directory and hacked the PYTHONPATH.

Brian Curtin (brian.curtin) wrote on 2012-07-12:

Looks fine. The change on line 18 of the diff to wrap the imports in parentheses isn't necessary but isn't hurting anything either.

review: Approve

dobey (dobey) wrote on 2012-07-13:

198 + return get_bin_cmd('ubuntu-sso-login')

There are a few uses of this, so perhaps we want to define a constant for this string as well?

review: Needs Information

Mike McCracken (mikemc) wrote on 2012-07-14:

rev 993 removes the code in ubuntu_sso/__init__ that added .exe to two of the four program names that sso can launch.

I confirmed that leaving this in does break launching e.g. ubuntu-sso-login-qt.exe from ubuntuone-control-panel.exe in a packaged windows app.

The two executables that weren't being added are the proxy & SSL cert ones launched using utils/runner/qt.py's spawn_program(), which has code intended to make the paths work on windows in development mode (unfrozen) - it checks to see if the program name ends in 'exe', and if it doesn't, it runs it with 'python.exe program_name'. This happens to also work in frozen mode if you pass the wrong program name, but I'm not sure it's really OK. At any rate, this change avoids that code path and passes in the right program name to launch for those two.

Mike McCracken (mikemc) wrote on 2012-07-14:

Looking at this further: I had the exe's mixed up - the proxy UI was getting .exe added in ubuntu_sso/__init__ -- the two that weren't were the 'ubuntu-sso-login' backend, which had been found using the registry, and the ubuntu-sso-ssl-certificate-qt UI, which would have the problem I outlined above.

As far as I can tell from a few minutes reading through the code, that UI won't be called correctly.

dobey (dobey) on 2012-07-17:

review: Approve

Ubuntu One Auto Pilot (otto-pilot) wrote on 2012-07-17:

Download full text (111.5 KiB)

The attempt to merge lp:~mikemc/ubuntu-sso-client/use-dirspec-get-program-path into lp:ubuntu-sso-client failed. Below is the output from the failed tests.

*** Running QT test suite for ubuntu_sso ***
running build
Compiled data/qt/proxy_credentials_dialog.ui into ubuntu_sso/qt/ui/proxy_credentials_dialog_ui.py
compiled data/qt/resources.qrc into ubuntu_sso/qt/ui/resources_rc.py
Compiled data/qt/setup_account.ui into ubuntu_sso/qt/ui/setup_account_ui.py
Compiled data/qt/reset_password.ui into ubuntu_sso/qt/ui/reset_password_ui.py
Compiled data/qt/network_detection.ui into ubuntu_sso/qt/ui/network_detection_ui.py
Compiled data/qt/forgotten_password.ui into ubuntu_sso/qt/ui/forgotten_password_ui.py
Compiled data/qt/ssl_dialog.ui into ubuntu_sso/qt/ui/ssl_dialog_ui.py
Compiled data/qt/success_message.ui into ubuntu_sso/qt/ui/success_message_ui.py
Compiled data/qt/loadingoverlay.ui into ubuntu_sso/qt/ui/loadingoverlay_ui.py
Compiled data/qt/current_user_sign_in.ui into ubuntu_sso/qt/ui/current_user_sign_in_ui.py
Compiled data/qt/error_message.ui into ubuntu_sso/qt/ui/error_message_ui.py
Compiled data/qt/email_verification.ui into ubuntu_sso/qt/ui/email_verification_ui.py
running build_py
creating build
creating build/lib.linux-x86_64-2.7
creating build/lib.linux-x86_64-2.7/ubuntu_sso
copying ubuntu_sso/__init__.py -> build/lib.linux-x86_64-2.7/ubuntu_sso
copying ubuntu_sso/account.py -> build/lib.linux-x86_64-2.7/ubuntu_sso
copying ubuntu_sso/credentials.py -> build/lib.linux-x86_64-2.7/ubuntu_sso
copying ubuntu_sso/logger.py -> build/lib.linux-x86_64-2.7/ubuntu_sso
creating build/lib.linux-x86_64-2.7/ubuntu_sso/tests
copying ubuntu_sso/tests/__init__.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/tests
copying ubuntu_sso/tests/linux.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/tests
copying ubuntu_sso/tests/test_credentials.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/tests
copying ubuntu_sso/tests/test_account.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/tests
creating build/lib.linux-x86_64-2.7/ubuntu_sso/keyring
copying ubuntu_sso/keyring/__init__.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring
copying ubuntu_sso/keyring/linux.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring
copying ubuntu_sso/keyring/pykeyring.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring
creating build/lib.linux-x86_64-2.7/ubuntu_sso/keyring/tests
copying ubuntu_sso/keyring/tests/__init__.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring/tests
copying ubuntu_sso/keyring/tests/test_common.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring/tests
copying ubuntu_sso/keyring/tests/test_linux.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring/tests
copying ubuntu_sso/keyring/tests/test_pykeyring.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring/tests
creating build/lib.linux-x86_64-2.7/ubuntu_sso/main
copying ubuntu_sso/main/__init__.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/main
copying ubuntu_sso/main/glib.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/main
copying ubuntu_sso/main/linux.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/main
copying ubuntu_sso/main/darwin.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/main
copying ubuntu_sso/main/windows.py -> build/lib.linu...

Ubuntu One Auto Pilot (otto-pilot) wrote on 2012-07-17:

Download full text (111.4 KiB)

The attempt to merge lp:~mikemc/ubuntu-sso-client/use-dirspec-get-program-path into lp:ubuntu-sso-client failed. Below is the output from the failed tests.

Ubuntu One Auto Pilot (otto-pilot) wrote on 2012-07-17:

Download full text (83.1 KiB)

The attempt to merge lp:~mikemc/ubuntu-sso-client/use-dirspec-get-program-path into lp:ubuntu-sso-client failed. Below is the output from the failed tests.

lp:~mikemc/ubuntu-sso-client/use-dirspec-get-program-path updated on 2012-07-17

994. By Mike McCracken on 2012-07-17: re-add pylint disable messages around win32 imports

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Manuel de la Peña

Mike McCracken

Natalia Bidart

Ubuntu One hackers

 === modified file 'ubuntu_sso/__init__.py'
 --- ubuntu_sso/__init__.py	2012-06-27 19:03:44 +0000
 +++ ubuntu_sso/__init__.py	2012-07-17 21:15:24 +0000
@@ -28,8 +28,6 @@
  # files in the program, then also delete it here.
  """Ubuntu Single Sign On client code."""
--import sys
--
  # DBus constants
  DBUS_BUS_NAME = "com.ubuntu.sso"
@@ -46,10 +44,9 @@
  USER_CANCELLATION = 10
  EXCEPTION_RAISED = 11
++BACKEND_EXECUTABLE = 'ubuntu-sso-login'
++
  # available UIs
++UI_SSL_DIALOG = 'ubuntu-sso-ssl-certificate-qt'
  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/credentials.py'
 --- ubuntu_sso/credentials.py	2012-06-27 19:03:44 +0000
 +++ ubuntu_sso/credentials.py	2012-07-17 21:15:24 +0000
@@ -43,8 +43,6 @@
  """
--import os
--
  from functools import wraps
  from twisted.internet import defer
@@ -56,7 +54,7 @@
+ )
  from ubuntu_sso.keyring import Keyring
  from ubuntu_sso.logger import setup_logging
--from ubuntu_sso.utils import get_bin_dir, runner
++from ubuntu_sso.utils import get_bin_cmd, runner
  logger = setup_logging('ubuntu_sso.credentials')
@@ -173,21 +171,19 @@
          """
          guis = (self.ui_executable, UI_EXECUTABLE_QT)
--        for gui_exe_path in guis:
--            ui_exe_path = os.path.join(get_bin_dir(), gui_exe_path)
--            ui_exe_exists = os.path.exists(ui_exe_path)
--            logger.debug('Attempting to use the following executable as GUI: '
--                '%r (exists? %r).', ui_exe_path, ui_exe_exists)
--            if not ui_exe_exists:
--                logger.error('The given UI path %r does not exist.',
--                    ui_exe_path)
++        for gui_exe_name in guis:
++            try:
++                args = get_bin_cmd(gui_exe_name)
++            except OSError:
++                logger.error('The given UI %r does not exist.',
++                             gui_exe_name)
              else:
                  break
          else:
              raise GUINotAvailableError('Can not find a GUI to present to the '
--                'user (tried with %r). Aborting.' % repr(guis))
++                                       'user (tried with %r). Aborting.' %
++                                       repr(guis))
--        args = [ui_exe_path]
          for arg in ('app_name', 'help_text', 'ping_url', 'policy_url',
                      'tc_url', 'window_id'):
              value = getattr(self, arg)
 === modified file 'ubuntu_sso/main/__init__.py'
 --- ubuntu_sso/main/__init__.py	2012-06-22 16:51:06 +0000
 +++ ubuntu_sso/main/__init__.py	2012-07-17 21:15:24 +0000
@@ -94,12 +94,10 @@
  else:
      from ubuntu_sso.main import linux as source
--    source.get_activation_cmdline = lambda *args: None
  UbuntuSSOClient = source.UbuntuSSOClient
  UbuntuSSOProxy = source.UbuntuSSOProxy
  get_sso_client = source.get_sso_client
--get_activation_cmdline = source.get_activation_cmdline
  def except_to_errdict(e):
 === modified file 'ubuntu_sso/main/darwin.py'
 --- ubuntu_sso/main/darwin.py	2012-05-21 14:38:23 +0000
 +++ ubuntu_sso/main/darwin.py	2012-07-17 21:15:24 +0000
@@ -31,8 +31,9 @@
  from dirspec import basedir
  from twisted.internet import defer
--import ubuntu_sso
++from ubuntu_sso import BACKEND_EXECUTABLE
  from ubuntu_sso.logger import setup_logging
++from ubuntu_sso.utils import get_bin_cmd
  from ubuntu_sso.utils.ipc import BaseClient
  from ubuntu_sso.main.perspective_broker import (
      SSO_SERVICE_NAME,
@@ -55,21 +56,6 @@
      return path
--def get_activation_cmdline(name):
--    """Find the path to the executable callback."""
--    # TODO: We have to either use launchd to launch the different services
--    # on demand or us LaunchServices to handle running the app via an URL.
--    ubuntu_sso_pkg_dir = os.path.dirname(os.path.dirname(ubuntu_sso.__file__))
--    ubuntu_sso_bin_dir = os.path.join(ubuntu_sso_pkg_dir, 'bin')
--    ubuntu_sso_bin = os.path.join(ubuntu_sso_bin_dir, 'ubuntu-sso-login')
--    ubuntuone_client_bin_dir = os.path.join(ubuntu_sso_pkg_dir,
--                                            '../ubuntuone-client/bin')
--    ubuntuone_client_bin = os.path.join(ubuntuone_client_bin_dir, name)
--    if os.path.exists(ubuntuone_client_bin):
--        return ubuntuone_client_bin
--    return ubuntu_sso_bin
--
--
  class DescriptionFactory(object):
      """Factory that provides the server and client descriptions."""
@@ -96,7 +82,7 @@
      @property
      def cmdline(self):
          """Get the command line to activate an executable."""
--        return get_activation_cmdline(self.name)
++        return get_bin_cmd(BACKEND_EXECUTABLE)
  class UbuntuSSOClient(BaseClient):
 === modified file 'ubuntu_sso/main/tests/test_windows.py'
 --- ubuntu_sso/main/tests/test_windows.py	2012-06-27 20:16:56 +0000
 +++ ubuntu_sso/main/tests/test_windows.py	2012-07-17 21:15:24 +0000
@@ -28,16 +28,9 @@
  # files in the program, then also delete it here.
  """Windows specific tests for the main module."""
--# pylint: disable=F0401
--try:
--    import winreg
--except ImportError:
--    import _winreg as winreg
--
  from twisted.internet import defer
  from ubuntu_sso.main import windows
--from ubuntu_sso.main import perspective_broker
  from ubuntu_sso.tests import TestCase
  # because we are using twisted we have java like names C0103
@@ -111,17 +104,6 @@
                           uid_modulo * windows.SSO_PORT_ALLOCATION_STEP)
          self._test_port_assignation(uid, expected_port)
--    def test_get_activation_cmdline(self):
--        """Test the get_activation_cmdline method."""
--        sample_value = "test 123"
--        self.patch(windows.winreg, "OpenKey",
--                   lambda key, subkey: sample_value)
--        self.patch(windows.winreg, "QueryValueEx",
--                   lambda key, v: (key, winreg.REG_SZ))
--        cmdline = windows.get_activation_cmdline(
--            perspective_broker.SSO_SERVICE_NAME)
--        self.assertEqual(sample_value, cmdline)
--
  class DescriptionFactoryTestcase(TestCase):
      """Test the factory."""
 === modified file 'ubuntu_sso/main/windows.py'
 --- ubuntu_sso/main/windows.py	2012-06-27 20:16:56 +0000
 +++ ubuntu_sso/main/windows.py	2012-07-17 21:15:24 +0000
@@ -37,19 +37,16 @@
  duplication between the different platform implementations.
  """
--
  # pylint: disable=F0401
  import win32process
  import win32security
--try:
--    import winreg
--except ImportError:
--    import _winreg as winreg
  # pylint: enable=F0401
  from twisted.internet import defer
++from ubuntu_sso import BACKEND_EXECUTABLE
  from ubuntu_sso.logger import setup_logging
++from ubuntu_sso.utils import get_bin_cmd
  from ubuntu_sso.utils.ipc import BaseClient
  from ubuntu_sso.main.perspective_broker import (
      SSO_SERVICE_NAME,
@@ -84,14 +81,6 @@
      return SSO_BASE_PB_PORT + uid_modulo * SSO_PORT_ALLOCATION_STEP
--def get_activation_cmdline(name):
--    """Find the path to the executable callback."""
--    key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, U1_REG_PATH)
--    # pylint: disable=W0612
--    value, registry_type = winreg.QueryValueEx(key, "path-" + name)
--    return value
--
--
  class DescriptionFactory(object):
      """Factory that provides the server and client descriptions."""
@@ -118,7 +107,7 @@
      @property
      def cmdline(self):
          """Get the command line to activate an executable."""
--        return get_activation_cmdline(self.name)
++        return get_bin_cmd(BACKEND_EXECUTABLE)
  class UbuntuSSOClient(BaseClient):
 === modified file 'ubuntu_sso/tests/test_credentials.py'
 --- ubuntu_sso/tests/test_credentials.py	2012-06-27 19:03:44 +0000
 +++ ubuntu_sso/tests/test_credentials.py	2012-07-17 21:15:24 +0000
@@ -123,7 +123,9 @@
          credentials.logger.addHandler(self.memento)
          self.addCleanup(credentials.logger.removeHandler, self.memento)
--        self.patch(credentials, 'get_bin_dir', lambda: self.bin_dir)
++        self.patch(credentials, 'get_bin_cmd',
++                   lambda x: [os.path.join(self.bin_dir,
++                                          KWARGS[UI_EXECUTABLE_KEY])])
      def _set_called(self, *args, **kwargs):
          """Set _called to True."""
@@ -351,10 +353,6 @@
                     lambda kr, app: defer.succeed(None))
          self._next_inner_result = credentials.USER_SUCCESS
--        # patch os.path.exists so it returns True for the faked exe_path
--        self.patch(credentials.os.path, 'exists',
--                   lambda path: path == self.exe_path)
--
          result = yield self.method_call(**self.kwargs)
          self.assertEqual(result, TOKEN)
@@ -369,28 +367,15 @@
                     lambda kr, app: defer.succeed(None))
          self._next_inner_result = credentials.USER_SUCCESS
--        assert not os.path.exists(self.exe_path)
--        self.patch(credentials.os.path, 'exists',
--                   lambda path: path.endswith(credentials.UI_EXECUTABLE_QT))
--
--        result = yield self.method_call(**self.kwargs)
--        self.assertEqual(result, TOKEN)
--
--        # the ui was opened and proper params were passed
--        args = yield self.deferred
--        self.inner_args[0] = os.path.join(self.bin_dir,
--                                          credentials.UI_EXECUTABLE_QT)
--        self.assertEqual(self.inner_args, args)
--
--    @defer.inlineCallbacks
--    def test_ui_executable_uses_qt_ui_if_none_available(self):
--        """The executable loads the QT UI if the requested does not exist."""
--        self.patch(credentials.Keyring, 'get_credentials',
--                   lambda kr, app: defer.succeed(None))
--        self._next_inner_result = credentials.USER_SUCCESS
--
--        self.patch(credentials.os.path, 'exists',
--                   lambda path: path.endswith(credentials.UI_EXECUTABLE_QT))
++        def get_bin_cmd_raises_if_not_qt(path):
++            """Simulates nonexistence of exes that aren't qt."""
++            if not path.endswith(credentials.UI_EXECUTABLE_QT):
++                raise OSError()
++            return [os.path.join(self.bin_dir,
++                                credentials.UI_EXECUTABLE_QT)]
++
++        self.patch(credentials, 'get_bin_cmd',
++                   get_bin_cmd_raises_if_not_qt)
          result = yield self.method_call(**self.kwargs)
          self.assertEqual(result, TOKEN)
@@ -406,7 +391,12 @@
          """If no GUI is available, raise GUINotAvailableError."""
          self.patch(credentials.Keyring, 'get_credentials',
                     lambda kr, app: defer.succeed(None))
--        self.patch(credentials.os.path, 'exists', lambda path: False)
++
++        def get_bin_cmd_just_raises(*args, **kwargs):
++            """Workaround for lambda: raise."""
++            raise OSError()
++
++        self.patch(credentials, 'get_bin_cmd', get_bin_cmd_just_raises)
          f = self.method_call(**self.kwargs)
          yield self.assertFailure(f, credentials.GUINotAvailableError)
@@ -418,9 +408,6 @@
                     lambda kr, app: defer.succeed(None))
          self._next_inner_result = credentials.USER_CANCELLATION
--        self.patch(credentials.os.path, 'exists',
--                   lambda path: path == self.exe_path)
--
          if exc is None:
              exc = credentials.UserCancellationError
          yield self.assertFailure(self.method_call(**self.kwargs), exc)
@@ -432,9 +419,6 @@
                     lambda kr, app: defer.succeed(None))
          self._next_inner_result = credentials.USER_CANCELLATION * 2  # other
--        self.patch(credentials.os.path, 'exists',
--                   lambda path: path == self.exe_path)
--
          exc = yield self.assertFailure(self.method_call(**self.kwargs),
                                         credentials.CredentialsError)
          if result is None:
@@ -461,9 +445,6 @@
                     lambda kr, app: defer.succeed(None))
          self.patch_inner(self.fail_inner)
--        self.patch(credentials.os.path, 'exists',
--                   lambda path: path == self.exe_path)
--
          yield self.assertFailure(self.method_call(**self.kwargs),
                                   SampleMiscException)
 === modified file 'ubuntu_sso/utils/__init__.py'
 --- ubuntu_sso/utils/__init__.py	2012-06-29 20:57:01 +0000
 +++ ubuntu_sso/utils/__init__.py	2012-07-17 21:15:24 +0000
@@ -33,6 +33,7 @@
  import sys
  import time
++from dirspec.utils import get_program_path
  from oauth import oauth
  try:
@@ -46,6 +47,10 @@
  from twisted.internet import defer
++from ubuntu_sso import (BACKEND_EXECUTABLE,
++                        UI_EXECUTABLE_QT,
++                        UI_PROXY_CREDS_DIALOG,
++                        UI_SSL_DIALOG)
  from ubuntu_sso.logger import setup_logging
  from ubuntu_sso.utils import webclient
@@ -62,6 +67,12 @@
  # platform as a key in the dictionary
  PLATFORM_QSS = QSS_MAP.get(sys.platform, ":/linux.qss")
++DARWIN_APP_NAMES = {BACKEND_EXECUTABLE: 'Ubuntu SSO Helper.app',
++                    UI_EXECUTABLE_QT: 'Ubuntu Single Sign-On.app',
++                    UI_SSL_DIALOG: 'Ubuntu SSO SSL Certificate.app',
++                    UI_PROXY_CREDS_DIALOG: 'Ubuntu SSO Proxy Credentials.app'
++                    }
++
  def _get_dir(dir_name, dir_constant):
      """Return the absolute path to this project's 'dir_name' dir.
@@ -116,18 +127,29 @@
      found, return the value of the BIN_DIR.
      """
--    # If sys is frozen, this is an .exe, and all binaries are in
--    # the same place
--    if getattr(sys, "frozen", None) is not None:
--        exec_path = os.path.abspath(sys.executable)
--        result = os.path.dirname(exec_path)
--    else:
--        result = _get_dir(dir_name=BIN_SUFFIX, dir_constant='BIN_DIR')
++    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
++def get_bin_cmd(program_name):
++    """Return a list of arguments to launch the given executable."""
++    path = get_program_path(program_name,
++                            fallback_dirs=[get_bin_dir()],
++                            app_names=DARWIN_APP_NAMES)
++    cmd_args = [path]
++
++    # adjust cmd for platforms using buildout-generated python
++    # wrappers
++    if getattr(sys, 'frozen', None) is None \
++            and sys.platform in ('win32', 'darwin'):
++        cmd_args.insert(0, 'python')
++
++    logger.debug('get_bin_cmd: returning %r', cmd_args)
++    return cmd_args
++
++
  class RequestHead(Request):
      """A request with the method set to HEAD."""
 === modified file 'ubuntu_sso/utils/tests/test_common.py'
 --- ubuntu_sso/utils/tests/test_common.py	2012-06-25 16:36:29 +0000
 +++ ubuntu_sso/utils/tests/test_common.py	2012-07-17 21:15:24 +0000
@@ -29,7 +29,6 @@
  """Tests for the oauth_headers helper function."""
  import logging
--import os
  import sys
  import time
@@ -167,17 +166,9 @@
      DIR_CONSTANT = 'BIN_DIR'
      DIR_GETTER = 'get_bin_dir'
--    def test_frozen_binary(self):
--        """Test that frozen binaries return a valid path."""
--        sys.frozen = True
--        self.addCleanup(delattr, sys, "frozen")
--        expected = os.path.dirname(os.path.abspath(sys.executable))
--        result = self.get_dir()
--        self.assertEqual(expected, result)
--
  class GetBinDirWithConstantsTestCase(GetProjectDirWithConstantsTestCase):
--    """Test case for get_bin_dir when constants module is not defined."""
++    """Test case for get_bin_dir when constants module is defined."""
      DIR_NAME = utils.BIN_SUFFIX
      DIR_CONSTANT = 'BIN_DIR'
 === modified file 'ubuntu_sso/utils/webclient/common.py'
 --- ubuntu_sso/utils/webclient/common.py	2012-06-29 20:57:01 +0000
 +++ ubuntu_sso/utils/webclient/common.py	2012-07-17 21:15:24 +0000
@@ -30,7 +30,6 @@
  import cgi
  import collections
--import os
  from httplib2 import iri2uri
  from oauth import oauth
@@ -43,13 +42,14 @@
  except ImportError:
      from urlparse import urlparse
--from ubuntu_sso import USER_SUCCESS, UI_PROXY_CREDS_DIALOG
++from ubuntu_sso import (USER_SUCCESS,
++                        UI_PROXY_CREDS_DIALOG,
++                        UI_SSL_DIALOG)
  from ubuntu_sso.logger import setup_logging
  from ubuntu_sso.utils.runner import spawn_program
  from ubuntu_sso.utils.ui import SSL_DETAILS_TEMPLATE
  from ubuntu_sso.utils.webclient.timestamp import TimestampChecker
--SSL_DIALOG = 'ubuntu-sso-ssl-certificate-qt'
  logger = setup_logging("ubuntu_sso.utils.webclient.common")
@@ -230,13 +230,12 @@
      def _launch_proxy_creds_dialog(self, domain, retry):
          """Launch the dialog used to get the creds."""
--        from ubuntu_sso.utils import get_bin_dir
++        from ubuntu_sso.utils import get_bin_cmd
++        args = get_bin_cmd(UI_PROXY_CREDS_DIALOG)
--        bin_dir = get_bin_dir()
--        args = (os.path.join(bin_dir, UI_PROXY_CREDS_DIALOG), '--domain',
--                                                                  domain)
++        args += ['--domain', domain]
          if retry:
--            args += ('--retry',)
++            args += ['--retry']
          return spawn_program(args)
      @defer.inlineCallbacks
@@ -273,12 +272,13 @@
      def _launch_ssl_dialog(self, domain, details):
          """Launch a dialog used to approve the ssl cert."""
--        from ubuntu_sso.utils import get_bin_dir
--
--        bin_dir = get_bin_dir()
--        args = (os.path.join(bin_dir, SSL_DIALOG), '--domain', domain,
--                                                   '--details', details,
--                                                   '--appname', self.appname)
++        from ubuntu_sso.utils import get_bin_cmd
++
++        args = get_bin_cmd(UI_SSL_DIALOG)
++        args += ['--domain', domain,
++                 '--details', details,
++                 '--appname', self.appname]
++
          return spawn_program(args)
      def _was_ssl_accepted(self, cert_details):