← 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: 2017-01-17 13:48:10 UTC
  • mfrom: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/lp_registration.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
 
18
 
17
19
 
18
20
import os
19
21
import socket
54
56
class XMLRPCTransport(xmlrpclib.Transport):
55
57
 
56
58
    def __init__(self, scheme):
57
 
        # In python2.4 xmlrpclib.Transport is a old-style class, and does not
58
 
        # define __init__, so we check first
59
 
        init = getattr(xmlrpclib.Transport, '__init__', None)
60
 
        if init is not None:
61
 
            init(self)
 
59
        xmlrpclib.Transport.__init__(self)
62
60
        self._scheme = scheme
63
61
        self._opener = _urllib2_wrappers.Opener()
64
62
        self.verbose = 0
86
84
 
87
85
    LAUNCHPAD_DOMAINS = {
88
86
        'production': 'launchpad.net',
89
 
        'edge': 'edge.launchpad.net',
90
87
        'staging': 'staging.launchpad.net',
 
88
        'qastaging': 'qastaging.launchpad.net',
91
89
        'demo': 'demo.launchpad.net',
92
90
        'dev': 'launchpad.dev',
93
91
        }
98
96
    for instance, domain in LAUNCHPAD_DOMAINS.iteritems():
99
97
        LAUNCHPAD_INSTANCE[instance] = 'https://xmlrpc.%s/bazaar/' % domain
100
98
 
101
 
    # Previously 'edge' was used to avoid a launchpad bug with redirection
 
99
    # We use production as the default because edge has been deprecated circa
 
100
    # 2010-11 (see bug https://bugs.launchpad.net/bzr/+bug/583667)
102
101
    DEFAULT_INSTANCE = 'production'
103
102
    DEFAULT_SERVICE_URL = LAUNCHPAD_INSTANCE[DEFAULT_INSTANCE]
104
103
 
165
164
            # the url?  perhaps a bit more secure against accidentally
166
165
            # revealing it.  std66 s3.2.1 discourages putting the
167
166
            # password in the url.
168
 
            hostinfo = '%s:%s@%s' % (urllib.quote(self.registrant_email),
169
 
                                     urllib.quote(self.registrant_password),
 
167
            hostinfo = '%s:%s@%s' % (urlutils.quote(self.registrant_email),
 
168
                                     urlutils.quote(self.registrant_password),
170
169
                                     hostinfo)
171
170
            url = urlunsplit((scheme, hostinfo, path, '', ''))
172
171
        else: