← Back to branch summary

~facundo/ubuntuone-client/working-speedups

« back to all changes in this revision

Viewing changes to ubuntuone/syncdaemon/dbus_interface.py

  • Committer: natalia.bidart at canonical
  • Date: 2010-10-07 16:04:50 UTC
  • mto: This revision was merged to the branch mainline in revision 731.
  • Revision ID: natalia.bidart@canonical.com-20101007160450-5wptfwjylchic31m
Added constant placeholder to be able to switch to new SSO dbus interface.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/syncdaemon/dbus_interface.py
66
66
    from ubuntuone import clientdefs
67
67
    APP_NAME = clientdefs.APP_NAME
68
68
    TC_URL = clientdefs.TC_URL
 
69
    PING_URL = clientdefs.PING_URL
69
70
    DESCRIPTION = clientdefs.DESCRIPTION
70
71
except ImportError:
71
72
    APP_NAME = "Ubuntu One (ImportError mode)"
72
 
    TC_URL = "https://one.ubuntu.com/terms"
 
73
    TC_URL = "https://one.ubuntu.com/terms/"
 
74
    PING_URL = "https://one.ubuntu.com/oauth/sso-finished-so-get-tokens/"
73
75
    DESCRIPTION = "Stub used since the real values can't be imported."
74
 
    logger.warning('Can not import APP_NAME, TC_URL, DESCRIPTION.'
75
 
                   'Using stub values (%s, %s, %s).',
76
 
                   APP_NAME, TC_URL, DESCRIPTION)
 
76
    logger.warning('Can not import APP_NAME, TC_URL, PING_URL, DESCRIPTION.'
 
77
                   'Using stub values (%s, %s, %s, %s).',
 
78
                   APP_NAME, TC_URL, PING_URL, DESCRIPTION)
77
79
 
78
80
 
79
81
class NoAccessToken(Exception):