← 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: Canonical.com Patch Queue Manager
  • Date: 2011-08-17 18:13:57 UTC
  • mfrom: (5268.7.29 transport-segments)
  • Revision ID: pqm@pqm.ubuntu.com-20110817181357-y5q5eth1hk8bl3om
(jelmer) Allow specifying the colocated branch to use in the branch URL,
 and retrieving the branch name using ControlDir._get_selected_branch.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/lp_registration.py
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
 
 
19
17
 
20
18
import os
21
19
import socket
56
54
class XMLRPCTransport(xmlrpclib.Transport):
57
55
 
58
56
    def __init__(self, scheme):
59
 
        xmlrpclib.Transport.__init__(self)
 
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)
60
62
        self._scheme = scheme
61
63
        self._opener = _urllib2_wrappers.Opener()
62
64
        self.verbose = 0
164
166
            # the url?  perhaps a bit more secure against accidentally
165
167
            # revealing it.  std66 s3.2.1 discourages putting the
166
168
            # password in the url.
167
 
            hostinfo = '%s:%s@%s' % (urlutils.quote(self.registrant_email),
168
 
                                     urlutils.quote(self.registrant_password),
 
169
            hostinfo = '%s:%s@%s' % (urllib.quote(self.registrant_email),
 
170
                                     urllib.quote(self.registrant_password),
169
171
                                     hostinfo)
170
172
            url = urlunsplit((scheme, hostinfo, path, '', ''))
171
173
        else: