Merge lp:~mandel/ubuntu-sso-client/ping_url_issues_windows into lp:ubuntu-sso-client

[Manuel de la Peña]

Fixes lp:776488

Ensures that the QStrings from the UI are casted to str.

Fixes lp:776488

Ensures that the QStrings from the UI are casted to str.

[Shane Fagan (shanepatrickfagan)]

+1

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'ubuntu_sso/qt/controllers.py'
--- ubuntu_sso/qt/controllers.py	2011-04-15 09:04:10 +0000
+++ ubuntu_sso/qt/controllers.py	2011-05-03 16:47:58 +0000
@@ -707,7 +707,7 @@
     def on_login_success(self, app_name, email):
         """Process the success of a login."""
         logger.debug('UbuntuSSOWizardController.on_login_success')
-        result = yield self.login_success_callback(app_name, email)
+        result = yield self.login_success_callback(str(app_name), str(email))
         logger.debug('Result from callback is %s', result)
         if result == 0:
             logger.info('Success in calling the given success_callback')
@@ -720,7 +720,8 @@
     def on_registration_success(self, app_name, email):
         """Process the success of a registration."""
         logger.debug('UbuntuSSOWizardController.on_registration_success')
-        result = yield self.registration_success_callback(app_name, email)
+        result = yield self.registration_success_callback(str(app_name),
+                                                          str(email))
         # TODO: what to do?
         logger.debug('Result from callback is %s', result)
         if result == 0: