Merge lp:~dobey/ubuntu-sso-client/update-13-10 into lp:ubuntu-sso-client/stable-13-10

[dobey]

[Rodney Dawes]

    Move the U1 SSO constants values to constants.py.in.

[Roberto Alsina (ralsina)]

review: Approve

[lp:~dobey/ubuntu-sso-client/update-13-10]

1033. By dobey on 2013-07-03

[Rodney Dawes]

    Move the U1 SSO constants values to constants.py.in.

=== modified file 'ubuntu_sso/constants.py.in'
--- ubuntu_sso/constants.py.in	2013-03-21 15:28:30 +0000
+++ ubuntu_sso/constants.py.in	2013-07-03 19:53:25 +0000
@@ -33,8 +33,32 @@
 """
 
 import os
+import platform
+import urllib
+
+from ubuntu_sso import SSO_UONE_BASE_URL
 
 VERSION = '@VERSION@'
 PROJECT_NAME = '@PROJECT_NAME@'
 PROJECT_DIR = os.path.join('@prefix@', 'share', PROJECT_NAME)
 BIN_DIR = os.path.join('@prefix@', 'lib', PROJECT_NAME)
+
+# Ubuntu One sso constants
+APP_NAME = u"Ubuntu One"
+TC_URL = u"%s/terms/" % SSO_UONE_BASE_URL
+POLICY_URL = u"%s/privacy/" % SSO_UONE_BASE_URL
+BASE_PING_URL = \
+    u"%s/oauth/sso-finished-so-get-tokens/{email}" % SSO_UONE_BASE_URL
+
+
+def platform_data():
+    result = {'platform': platform.system(),
+              'platform_version': platform.release(),
+              'platform_arch': platform.machine(),
+              'client_version': VERSION}
+    # urlencode will not encode unicode, only bytes
+    result = urllib.urlencode(result)
+    return result
+
+# the result of platform_data is given by urlencode, encoded with ascii
+PING_URL = BASE_PING_URL + u"?" + platform_data().decode('ascii')

=== modified file 'ubuntu_sso/qt/sso_wizard_page.py'
--- ubuntu_sso/qt/sso_wizard_page.py	2013-04-19 15:32:17 +0000
+++ ubuntu_sso/qt/sso_wizard_page.py	2013-07-03 19:53:25 +0000
@@ -28,9 +28,6 @@
 # files in the program, then also delete it here.
 """Qt implementation of the UI."""
 
-import platform
-import urllib
-
 from functools import wraps
 
 # pylint: disable=F0401,E0611
@@ -47,7 +44,8 @@
 )
 from twisted.internet import defer
 
-from ubuntu_sso import constants, main, SSO_UONE_BASE_URL
+from ubuntu_sso import main
+from ubuntu_sso.constants import APP_NAME, TC_URL, POLICY_URL, PING_URL
 from ubuntu_sso.logger import setup_gui_logging, log_call
 from ubuntu_sso.qt import (
     ERROR_STYLE,
@@ -61,25 +59,6 @@
 logger = setup_gui_logging('ubuntu_sso.sso_wizard_page')
 
 
-def platform_data():
-    result = {'platform': platform.system(),
-              'platform_version': platform.release(),
-              'platform_arch': platform.machine(),
-              'client_version': constants.VERSION}
-    # urlencode will not encode unicode, only bytes
-    result = urllib.urlencode(result)
-    return result
-
-
-APP_NAME = u"Ubuntu One"
-TC_URL = u"%s/terms/" % SSO_UONE_BASE_URL
-POLICY_URL = u"%s/privacy/" % SSO_UONE_BASE_URL
-BASE_PING_URL = \
-    u"%s/oauth/sso-finished-so-get-tokens/{email}" % SSO_UONE_BASE_URL
-# the result of platform_data is given by urlencode, encoded with ascii
-PING_URL = BASE_PING_URL + u"?" + platform_data().decode('ascii')
-
-
 class WizardHeader(QFrame):
     """WizardHeader Class for Title and Subtitle in all wizard pages."""