← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/launchpad/lp_registration.py

  • Committer: Vincent Ladeuil
  • Date: 2011-02-18 10:33:36 UTC
  • mto: This revision was merged to the branch mainline in revision 5684.
  • Revision ID: v.ladeuil+lp@free.fr-20110218103336-83nx6nqk06ibgqky
Turn the exception about dict option expansion into a warning.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/lp_registration.py
86
86
 
87
87
    LAUNCHPAD_DOMAINS = {
88
88
        'production': 'launchpad.net',
89
 
        'edge': 'edge.launchpad.net',
 
89
        'qastaging': 'qastaging.launchpad.net',
90
90
        'staging': 'staging.launchpad.net',
91
91
        'demo': 'demo.launchpad.net',
92
92
        'dev': 'launchpad.dev',
98
98
    for instance, domain in LAUNCHPAD_DOMAINS.iteritems():
99
99
        LAUNCHPAD_INSTANCE[instance] = 'https://xmlrpc.%s/bazaar/' % domain
100
100
 
101
 
    # Previously 'edge' was used to avoid a launchpad bug with redirection
 
101
    # We use production as the default because edge has been deprecated circa
 
102
    # 2010-11 (see bug https://bugs.launchpad.net/bzr/+bug/583667)
102
103
    DEFAULT_INSTANCE = 'production'
103
104
    DEFAULT_SERVICE_URL = LAUNCHPAD_INSTANCE[DEFAULT_INSTANCE]
104
105